Hopefully fix publishing issue, bump to 0.9.1

Monkopedia · Jun 1, 2024 · e91d3ee · e91d3ee
1 parent e13bc89
commit e91d3ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -51,7 +51,7 @@ jobs:
         run: gradle build -Psigning.gnupg.passphrase='${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}' || gradle build -Psigning.gnupg.passphrase='${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}' || gradle build -Psigning.gnupg.passphrase='${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}'
 
       - name: Publish package
-        run: gradle publish -Psigning.gnupg.passphrase='${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}'
+        run: gradle publishIosArm64PublicationToOSSRHRepository publishIosSimulatorArm64PublicationToOSSRHRepository publishIosX64PublicationToOSSRHRepository publishMacosArm64PublicationToOSSRHRepository publishMacosX64PublicationToOSSRHRepository -Psigning.gnupg.passphrase='${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}'
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
diff --git a/compiler/local-plugin/src/main/kotlin/GenerateKsrpcProject.kt b/compiler/local-plugin/src/main/kotlin/GenerateKsrpcProject.kt
@@ -15,7 +15,7 @@
  */
 package com.monkopedia.ksrpc.local
 
-import org.gradle.api.GradleException
+import java.io.File
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.publish.PublishingExtension
@@ -26,17 +26,14 @@ import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.maven
-import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.withType
 import org.gradle.plugins.signing.SigningExtension
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests
 import org.jetbrains.kotlin.gradle.targets.js.yarn.yarn
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.io.File
 
 class KsrpcDummyPlugin : Plugin<Project> {
     override fun apply(project: Project) {
@@ -108,18 +105,15 @@ fun Project.ksrpcModule(
                 }
             }
 
-            val hostOs = System.getProperty("os.name")
-            if (hostOs == "Linux") {
-                linuxX64 {
+            linuxX64 {
+                binaries {}
+                nativeConfig()
+            }
+            if (supportLinuxArm64) {
+                linuxArm64 {
                     binaries {}
                     nativeConfig()
                 }
-                if (supportLinuxArm64) {
-                    linuxArm64 {
-                        binaries {}
-                        nativeConfig()
-                    }
-                }
             }
             if (supportAndroidNative) {
                 androidNativeX64 {
@@ -290,11 +284,11 @@ fun Project.ksrpcModule(
     }
     project.afterEvaluate {
         tasks.withType(org.gradle.plugins.signing.Sign::class) { signingTask ->
-            tasks.withType(org.gradle.api.publish.maven.tasks.AbstractPublishToMaven::class) { publishTask ->
+            tasks.withType(
+                org.gradle.api.publish.maven.tasks.AbstractPublishToMaven::class
+            ) { publishTask ->
                 publishTask.dependsOn(signingTask)
             }
         }
-
-
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=0.9.0
+version=0.9.1
 signing.gnupg.keyName=5B83421E2338B907
 org.gradle.jvmargs=-Xmx4096m
 kotlin.mpp.enableCInteropCommonization=true