fixed issue with storeGitHubCredentials checking dep resolution

moneyforward · Nov 25, 2024 · af4a0db · af4a0db
1 parent d3cb914
commit af4a0db
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/main/kotlin/com/moneyforward/gradle/PrivateRepositoryPlugin.kt b/src/main/kotlin/com/moneyforward/gradle/PrivateRepositoryPlugin.kt
@@ -4,8 +4,8 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.api.initialization.Settings
+import org.gradle.api.logging.Logger
 import org.gradle.api.provider.Provider
-import org.slf4j.Logger
 
 /**
  * Configures the [private repository configuration][PrivateRepositoryConfiguration] used
@@ -46,11 +46,20 @@ class PrivateRepositoryPlugin : Plugin<Any> {
 
     private fun apply(project: Project) {
         logger = project.logger
+        val logger = project.logger
 
-        project.tasks.create("storeGitHubCredentials", StoreGitHubCredentialsTask::class.java)
+        project.tasks.create(StoreGitHubCredentialsTask.NAME, StoreGitHubCredentialsTask::class.java)
 
         project.afterEvaluate {
-            project.repositories.apply(ProjectPropertyDelegate(project), PROJECT_PLUGIN_DATA)
+            val tasks = it.gradle.startParameter.taskNames
+            // do not apply repository settings if running the storeGitHubCredentials task
+            if (tasks.any { task -> task == StoreGitHubCredentialsTask.NAME }) {
+                project.repositories.apply(ProjectPropertyDelegate(project), PROJECT_PLUGIN_DATA)
+                if (tasks.size > 1) logger.warn(
+                    "{} should be ran in isolation, running it with other tasks may cause unexpected issues.",
+                    StoreGitHubCredentialsTask.NAME
+                )
+            }
         }
     }
 

diff --git a/src/main/kotlin/com/moneyforward/gradle/StoreGitHubCredentialsTask.kt b/src/main/kotlin/com/moneyforward/gradle/StoreGitHubCredentialsTask.kt
@@ -2,8 +2,6 @@ package com.moneyforward.gradle
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.TaskAction
@@ -102,10 +100,11 @@ abstract class StoreGitHubCredentialsTask : DefaultTask() {
         return properties
     }
 
-    private companion object {
-        const val NONE          = 0
-        const val USERNAME_FLAG = 1
-        const val TOKEN_FLAG    = 2
-        const val ALL_FLAGS     = 3
+    companion object {
+        private const val NONE          = 0
+        private const val USERNAME_FLAG = 1
+        private const val TOKEN_FLAG    = 2
+        private const val ALL_FLAGS     = 3
+        internal const val NAME = "storeGitHubCredentials"
     }
 }