Merge pull request #51 from boschglobal/feature-46_4

eclipse-kuksa · Nov 29, 2023 · d6d2fce · d6d2fce
2 parents 74a1810 + 5b75f19
commit d6d2fce
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/.github/workflows/deploy-release.yaml b/.github/workflows/deploy-release.yaml
@@ -28,6 +28,7 @@ jobs:
 
       - name: Publish Library
         env:
+          ORG_GPG_KEY_ID: ${{ secrets.ORG_GPG_KEY_ID }}
           ORG_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }}
           ORG_GPG_PRIVATE_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
           ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}

diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml
@@ -32,8 +32,9 @@ jobs:
 
       - name: Publish Library
         env:
+          ORG_GPG_KEY_ID: ${{ secrets.ORG_GPG_KEY_ID }}
           ORG_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }}
           ORG_GPG_PRIVATE_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
           ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
           ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }}
-        run: ./gradlew publishAllPublicationsToOSSRHSnapshotRepository
+        run: ./gradlew --stacktrace publishAllPublicationsToOSSRHSnapshotRepository
diff --git a/README.md b/README.md
@@ -26,21 +26,9 @@ Snapshot builds are also available (but of course less stable): [Package view](h
 See the [quickstart guide](https://github.com/eclipse-kuksa/kuksa-android-sdk/tree/main/docs/QUICKSTART.md) for 
 additional integration options.
 
-### GitHub packages
+### Maven Central
 
-The KUKSA SDK is currently uploaded to [GitHub packages](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry)
-where an [authentication](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry#authenticating-to-github-packages)
-is needed to download the dependency.
-
-```
-maven {
-    url = uri("https://maven.pkg.github.com/eclipse-kuksa/kuksa-android-sdk")
-    credentials {
-        username = <USERNAME>
-        password = <GITHUB_TOKEN>
-    }
-}
-```
+The KUKSA SDK is currently uploaded to [Maven Central](https://central.sonatype.com/search?q=org.eclipse.kuksa).
 
 ## Usage
 

diff --git a/buildSrc/src/main/kotlin/publish.gradle.kts b/buildSrc/src/main/kotlin/publish.gradle.kts
@@ -29,11 +29,6 @@ interface PublishPluginExtension {
 
 val extension = project.extensions.create<PublishPluginExtension>("publish")
 
-// configure GPG -> https://docs.gradle.org/current/userguide/signing_plugin.html#example_configure_the_gnupgsignatory
-ext["signing.gnupg.executable"] = "gpg"
-ext["signing.gnupg.keyName"] = System.getenv("ORG_GPG_PRIVATE_KEY")
-ext["signing.gnupg.passphrase"] = System.getenv("ORG_GPG_PASSPHRASE")
-
 afterEvaluate {
     publishing {
         repositories {
@@ -79,7 +74,19 @@ afterEvaluate {
     }
 
     signing {
-        useGpgCmd()
+        var keyId: String? = System.getenv("ORG_GPG_KEY_ID")
+        if (keyId != null && keyId.length > 8) {
+            keyId = keyId.takeLast(8)
+        }
+        val privateKey = System.getenv("ORG_GPG_PRIVATE_KEY")
+        val passphrase = System.getenv("ORG_GPG_PASSPHRASE")
+
+        useInMemoryPgpKeys(
+            keyId,
+            privateKey,
+            passphrase,
+        )
+
         sign(publishing.publications)
     }
 }