Fix platforms

Him188 · Nov 18, 2021 · 6762c62 · 6762c62
1 parent 95c069a
commit 6762c62
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/buildSrc/src/main/kotlin/PublishingHelpers.kt b/buildSrc/src/main/kotlin/PublishingHelpers.kt
@@ -92,8 +92,9 @@ inline fun Project.setupPublishing(
                     setUrl("https://oss.sonatype.org/service/local/staging/deploy/maven2")
 
                     credentials {
-                        username = System.getenv("SONATYPE_USER")
-                        password = System.getenv("SONATYPE_KEY")
+                        username = System.getenv("SONATYPE_USER") ?: rootProject.properties["sonatype.user"]?.toString()
+                        password =
+                            System.getenv("SONATYPE_KEY") ?: rootProject.properties["sonatype.password"]?.toString()
                     }
                 }
             }

diff --git a/runtime/gradle/compile-native-multiplatform.gradle b/runtime/gradle/compile-native-multiplatform.gradle
@@ -8,8 +8,8 @@ kotlin {
     targets {
         def hostOs = System.getProperty("os.name")
 
-        def linuxEnabled = hostOs == "Mac OS X"
-        def macosEnabled = hostOs == "Linux"
+        def linuxEnabled = hostOs == "Linux"
+        def macosEnabled = hostOs.startsWith("Mac")
         def winEnabled =  hostOs.startsWith("Windows")
 
         project.ext.isLinuxHost = linuxEnabled

diff --git a/runtime/gradle/publish.gradle b/runtime/gradle/publish.gradle
@@ -159,8 +159,8 @@ publishing {
             url = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
 
             credentials {
-                username = System.getenv("SONATYPE_USER")
-                password = System.getenv("SONATYPE_KEY")
+                username = System.getenv("SONATYPE_USER") ?: rootProject.properties.get("sonatype.user")?.toString()
+                password = System.getenv("SONATYPE_KEY") ?: rootProject.properties.get("sonatype.password")?.toString()
             }
         }
     }