Fix check-publication functionality (#21)

05nelsonm · May 11, 2022 · e39cd95 · e39cd95
1 parent aefa62b
commit e39cd95
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 25 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -14,6 +14,3 @@ kotlin.mpp.stability.nowarn=true
 
 kotlin.native.binary.memoryModel=experimental
 kotlin.native.ignoreDisabledTargets=true
-
-kotlin.mpp.enableCInteropCommonization=true
-kotlin.mpp.commonizerLogLevel=info
diff --git a/kotlin-components b/kotlin-components
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,24 +3,24 @@ rootProject.name = "component-encoding"
 includeBuild("kotlin-components/includeBuild/dependencies")
 includeBuild("kotlin-components/includeBuild/kmp")
 
-include(":encoding-base16")
-include(":encoding-base32")
-include(":encoding-base64")
-include(":encoding-test")
-
 // if JVM is not being built, don't include the app
 @Suppress("PrivatePropertyName")
 private val KMP_TARGETS: String? by settings
 
 private val allTargets = System.getProperty("KMP_TARGETS_ALL") != null
 private val targets = KMP_TARGETS?.split(',')
 
-if (allTargets || targets?.contains("JVM") != false) {
-    include(":app")
-}
-
 @Suppress("PrivatePropertyName")
 private val CHECK_PUBLICATION: String? by settings
 if (CHECK_PUBLICATION != null) {
     include(":tools:check-publication")
+} else {
+    include(":encoding-base16")
+    include(":encoding-base32")
+    include(":encoding-base64")
+    include(":encoding-test")
+
+    if (allTargets || targets?.contains("JVM") != false) {
+        include(":app")
+    }
 }
diff --git a/tools/check-publication/build.gradle.kts b/tools/check-publication/build.gradle.kts
@@ -17,6 +17,8 @@ import io.matthewnelson.kotlin.components.dependencies.versions
 import io.matthewnelson.kotlin.components.kmp.KmpTarget
 import io.matthewnelson.kotlin.components.kmp.publish.isSnapshotVersion
 import io.matthewnelson.kotlin.components.kmp.publish.kmpPublishRootProjectConfiguration
+import io.matthewnelson.kotlin.components.kmp.util.includeSnapshotsRepoIfTrue
+import io.matthewnelson.kotlin.components.kmp.util.includeStagingRepoIfTrue
 import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
 
 plugins {
@@ -26,18 +28,8 @@ plugins {
 
 val pConfig = kmpPublishRootProjectConfiguration!!
 
-repositories {
-    if (pConfig.isSnapshotVersion) {
-        maven("https://oss.sonatype.org/content/repositories/snapshots/")
-    } else {
-        maven("https://oss.sonatype.org/content/groups/staging") {
-            credentials {
-                username = rootProject.ext.get("mavenCentralUsername").toString()
-                password = rootProject.ext.get("mavenCentralPassword").toString()
-            }
-        }
-    }
-}
+includeSnapshotsRepoIfTrue(pConfig.isSnapshotVersion)
+includeStagingRepoIfTrue(!pConfig.isSnapshotVersion)
 
 kmpConfiguration {
     setupMultiplatform(