Prepare for release 1.5.4

cashapp · Oct 6, 2022 · 7d8ab90 · 7d8ab90
1 parent 4611b57
commit 7d8ab90
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 31 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -33,24 +33,24 @@ jobs:
       - name: Publish the macOS artifacts
         if: matrix.os == 'macOS-latest'
         env:
-          ORG_GRADLE_PROJECT_mavenCentralRepositoryUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralRepositoryPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }}
-        run: ./gradlew publishAllPublicationsToMavenRepository --no-daemon
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }}
+        run: ./gradlew publishAllPublicationsToMavenCentralRepository --no-daemon
       - name: Publish the windows artifact
         if: matrix.os == 'windows-latest'
         env:
-          ORG_GRADLE_PROJECT_mavenCentralRepositoryUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralRepositoryPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }}
-        run: ./gradlew publishMingwX64PublicationToMavenRepository publishMingwX86PublicationToMavenRepository
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }}
+        run: ./gradlew publishMingwX64PublicationToMavenCentralRepository publishMingwX86PublicationToMavenCentralRepository
       - name: Publish the linux artifact
         if: matrix.os == 'ubuntu-18.04'
         env:
-          ORG_GRADLE_PROJECT_mavenCentralRepositoryUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralRepositoryPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }}
-        run: ./gradlew publishLinuxX64PublicationToMavenRepository
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }}
+        run: ./gradlew publishLinuxX64PublicationToMavenCentralRepository
 
   publish_plugin:
     runs-on: ubuntu-latest

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.squareup.sqldelight
-VERSION_NAME=1.5.3
+VERSION_NAME=1.5.4
 
 POM_URL=https://github.com/square/sqldelight/
 POM_SCM_URL=https://github.com/square/sqldelight/
@@ -13,8 +13,8 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=square
 POM_DEVELOPER_NAME=Square, Inc.
 
-org.gradle.jvmargs=-Xms128m -Xmx2048m
-systemProp.org.gradle.internal.publish.checksums.insecure=true
+SONATYPE_HOST=S01
+RELEASE_SIGNING_ENABLED=true
 
 android.useAndroidX=true
 

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -24,7 +24,7 @@ ext.deps = [
         dokka: "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}",
         intellij: "org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.1.2",
         grammarKitComposer: "com.alecstrong:grammar-kit-composer:0.1.10",
-        publish: "com.vanniktech:gradle-maven-publish-plugin:0.14.2",
+        publish: "com.vanniktech:gradle-maven-publish-plugin:0.20.0",
         spotless: "com.diffplug.spotless:spotless-plugin-gradle:5.17.1",
         changelog: "org.jetbrains.intellij.plugins:gradle-changelog-plugin:1.3.1",
         shadow: "com.github.jengelman.gradle.plugins:shadow:6.1.0"

diff --git a/gradle/gradle-mvn-push.gradle b/gradle/gradle-mvn-push.gradle
@@ -5,10 +5,6 @@ tasks.named("dokkaGfm").configure {
   outputDirectory = file("$rootDir/docs/1.x")
 }
 
-mavenPublish {
-  releaseSigningEnabled = !getGpgKey().isEmpty()
-}
-
 publishing {
     repositories {
         maven {
@@ -17,14 +13,3 @@ publishing {
         }
     }
 }
-
-def getGpgKey() {
-  return hasProperty('signingKey') ? signingKey : ""
-}
-
-signing {
-  def signingKey = getGpgKey()
-  if (!signingKey.isEmpty()) {
-    useInMemoryPgpKeys(signingKey, "")
-  }
-}