Backporting improvements from klip and monko

mpetuska · Aug 26, 2021 · 737e139 · 737e139
1 parent 931a96c
commit 737e139
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 33 deletions.
diff --git a/.github/workflows/sandbox.yml b/.github/workflows/sandbox.yml
@@ -22,7 +22,6 @@ on:
 
 env:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"
-  MONGO_URL: ${{ secrets.MONGO_URL }}
 
 jobs:
   build:
@@ -101,6 +100,14 @@ jobs:
 
       - name: Run Command
         if: ${{ startsWith(matrix.os.runner, github.event.inputs.runner) }}
+        env:
+          GH_USERNAME: ${{ github.actor }}
+          GH_PASSWORD: ${{ github.token }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
+          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
         run: ${{ github.event.inputs.command }}
 
       - uses: actions/upload-artifact@v2

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   id("plugin.library-mpp")
-  id("plugin.publishing-mpp")
   id("plugin.publishing-nexus")
+  id("plugin.publishing-mpp")
   id("com.github.jakemarsden.git-hooks")
 }
 

diff --git a/buildSrc/src/main/kotlin/plugin.publishing.gradle.kts b/buildSrc/src/main/kotlin/plugin.publishing.gradle.kts
@@ -61,36 +61,6 @@ tasks {
 }
 
 publishing {
-  fun Collection<KotlinTarget>.onlyBuildIf(enabled: Spec<in Task>) {
-    forEach {
-      it.compilations.all {
-        compileKotlinTask.onlyIf(enabled)
-      }
-    }
-  }
-
-  fun Collection<Named>.onlyPublishIf(enabled: Spec<in Task>) {
-    val publications: Collection<String> = map { it.name }
-    afterEvaluate {
-      publishing {
-        publications {
-          matching { it.name in publications }.all {
-            val targetPublication = this@all
-            tasks.withType<AbstractPublishToMaven>()
-              .matching { it.publication == targetPublication }
-              .configureEach {
-                onlyIf(enabled)
-              }
-            tasks.withType<GenerateModuleMetadata>()
-              .matching { it.publication.get() == targetPublication }
-              .configureEach {
-                onlyIf(enabled)
-              }
-          }
-        }
-      }
-    }
-  }
   publications {
     val ghOwnerId: String = project.properties["gh.owner.id"]!!.toString()
     val ghOwnerName: String = project.properties["gh.owner.name"]!!.toString()

diff --git a/gradle.properties b/gradle.properties
@@ -25,5 +25,5 @@ group=dev.petuska
 description=Template for kotlin multiplatform library
 version=0.0.0
 #======================================== Build =========================================
-# linux | osx | windows
+# linux | macos | windows
 project.mainOS=linux