Merge pull request #93 from touchlab/kpg/fix_spm_with_cocoapods

Delay git path call until needed
touchlab · Oct 10, 2022 · 85b2e19 · 85b2e19
2 parents 975d73d + 0ca2f4d
commit 85b2e19
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@ android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2g
 
 GROUP=co.touchlab.faktory
-VERSION_NAME=0.2.2
+VERSION_NAME=0.2.3
 KOTLIN_VERSION=1.6.21
 
 POM_URL=https://github.com/touchlab/KMMBridge

diff --git a/kmmbridge/src/main/kotlin/KmmBridgeExtension.kt b/kmmbridge/src/main/kotlin/KmmBridgeExtension.kt
@@ -21,7 +21,6 @@ import co.touchlab.faktory.dependencymanager.CocoapodsDependencyManager
 import co.touchlab.faktory.dependencymanager.DependencyManager
 import co.touchlab.faktory.dependencymanager.SpecRepo
 import co.touchlab.faktory.dependencymanager.SpmDependencyManager
-import co.touchlab.faktory.internal.procRunFailLog
 import co.touchlab.faktory.versionmanager.GitTagVersionManager
 import co.touchlab.faktory.versionmanager.GithubReleaseVersionManager
 import co.touchlab.faktory.versionmanager.ManualVersionManager
@@ -31,7 +30,6 @@ import org.gradle.api.Project
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
-import java.io.File
 
 interface KmmBridgeExtension {
     /**
@@ -100,8 +98,7 @@ interface KmmBridgeExtension {
         spmDirectory: String? = null,
         packageName: String = project.name,
     ) {
-        val swiftPackageFolder = spmDirectory ?: findRepoRoot()
-        val dependencyManager = SpmDependencyManager(swiftPackageFolder, packageName)
+        val dependencyManager = SpmDependencyManager(spmDirectory, packageName)
         dependencyManagers.set(dependencyManagers.getOrElse(emptyList()) + dependencyManager)
     }
 
@@ -113,9 +110,4 @@ interface KmmBridgeExtension {
         val dependencyManager = CocoapodsDependencyManager(specRepo)
         dependencyManagers.set(dependencyManagers.getOrElse(emptyList()) + dependencyManager)
     }
-}
-
-private fun Project.findRepoRoot(): String {
-    val repoFile = File(procRunFailLog("git", "rev-parse", "--show-toplevel").first())
-    return projectDir.toPath().relativize(repoFile.toPath()).toString()
 }
diff --git a/kmmbridge/src/main/kotlin/dependencymanager/SpmDependencyManager.kt b/kmmbridge/src/main/kotlin/dependencymanager/SpmDependencyManager.kt
@@ -27,11 +27,11 @@ class SpmDependencyManager(
     /**
      * Folder where the Package.swift file lives
      */
-    private val swiftPackageFolder: String,
+    private val _swiftPackageFolder: String?,
     private val packageName: String
 ) : DependencyManager {
-    private val swiftPackageFilePath: String
-        get() = "${stripEndSlash(swiftPackageFolder)}/Package.swift"
+    private fun Project.swiftPackageFolder(): String = _swiftPackageFolder ?: this.findRepoRoot()
+    private fun Project.swiftPackageFilePath(): String = "${stripEndSlash(swiftPackageFolder())}/Package.swift"
 
     override fun configure(project: Project, uploadTask: Task, publishRemoteTask: Task) {
         val updatePackageSwiftTask = project.task("updatePackageSwift") {
@@ -66,14 +66,14 @@ class SpmDependencyManager(
             @Suppress("ObjectLiteralToLambda")
             doLast(object : Action<Task> {
                 override fun execute(t: Task) {
-                    project.writePackageFile(makeLocalDevPackageFileText(swiftPackageFolder, packageName, project))
+                    project.writePackageFile(makeLocalDevPackageFileText(project.swiftPackageFolder(), packageName, project))
                 }
             })
         }
     }
 
     private fun Project.writePackageFile(packageName: String, url: String, checksum: String){
-        val swiftPackageFile = file(swiftPackageFilePath)
+        val swiftPackageFile = file(swiftPackageFilePath())
         val packageText = makePackageFileText(packageName, url, checksum)
         swiftPackageFile.parentFile.mkdirs()
         swiftPackageFile.writeText(packageText)
@@ -108,7 +108,7 @@ class SpmDependencyManager(
     }
 
     private fun Project.writePackageFile(data:String){
-        file(swiftPackageFilePath).writeText(data)
+        file(swiftPackageFilePath()).writeText(data)
     }
 
     override val needsGitTags: Boolean = true
@@ -185,3 +185,8 @@ let package = Package(
     ]
 )
 """.trimIndent()
+
+private fun Project.findRepoRoot(): String {
+    val repoFile = File(procRunFailLog("git", "rev-parse", "--show-toplevel").first())
+    return projectDir.toPath().relativize(repoFile.toPath()).toString()
+}