tidy upp old build files, and api files

mockk · Jul 30, 2022 · 3e84f30 · 3e84f30
1 parent 5344d65
commit 3e84f30
Show file tree

Hide file tree

Showing 23 changed files with 6 additions and 2,982 deletions.
diff --git a/agent/android/api/mockk-agent-android.api b/agent/android/api/mockk-agent-android.api
diff --git a/agent/api/build.gradle.kts b/agent/api/build.gradle.kts
diff --git a/agent/common/build.gradle.kts b/agent/common/build.gradle.kts
diff --git a/agent/jvm/api/mockk-agent-jvm.api b/agent/jvm/api/mockk-agent-jvm.api
diff --git a/agent/jvm/build.gradle b/agent/jvm/build.gradle
diff --git a/buildSrc/android-sdk-detector.settings.gradle.kts b/buildSrc/android-sdk-detector.settings.gradle.kts
@@ -20,9 +20,10 @@ val sdkDirFile: java.io.File? = listOf(
             ?.takeIf { it.exists() }
     }.find { it.isDirectory }
 
-var androidSdkDetected: Boolean by extra(sdkDirFile != null)
+var androidSdkDetected: Boolean by extra
 
-if (androidSdkDetected) {
+if (sdkDirFile != null) {
+    androidSdkDetected = true
     logger.lifecycle("[android-sdk-detector] Android SDK detected: ${sdkDirFile.canonicalPath}")
 
     if (
@@ -34,6 +35,7 @@ if (androidSdkDetected) {
         props.setProperty(sdkDirProperty, path)
     }
 } else {
+    androidSdkDetected = false
     logger.lifecycle(
         """
            | [WARNING] Skipping build of Android related modules because Android SDK has not been found!

diff --git a/dsl/common/build.gradle.kts b/dsl/common/build.gradle.kts
diff --git a/dsl/js/build.gradle.kts b/dsl/js/build.gradle.kts