[no ci] fix publishing

lukebemishprojects · Nov 21, 2023 · a46fa3f · a46fa3f
1 parent 7b5cab7
commit a46fa3f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 28 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
           ./gradlew build
       - name: Publish
         run: |
-          ./gradlew publish publishPlugins closeAndReleaseSonatypeStagingRepository
+          ./gradlew release closeAndReleaseSonatypeStagingRepository
         env:
           IS_RELEASE: true
           MAVEN_USER: github

diff --git a/buildSrc/src/main/groovy/opensesame.conventions.gradle b/buildSrc/src/main/groovy/opensesame.conventions.gradle
@@ -188,4 +188,8 @@ class OpenSesameConventionExtension {
     }
 }
 
-project.extensions.add('openSesameConvention', OpenSesameConventionExtension)
+project.extensions.add('openSesameConvention', OpenSesameConventionExtension)
+
+tasks.register('release') {
+    dependsOn('publish')
+}
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -53,35 +53,30 @@ processResources {
     from rootProject.file('LICENSE')
 }
 
-if (System.getenv('GRADLE_PLUGIN_KEY')) {
-    ext['gradle.publish.key'] = System.getenv('GRADLE_PLUGIN_KEY')
-    ext['gradle.publish.secret'] = System.getenv('GRADLE_PLUGIN_SECRET')
-}
-
-afterEvaluate {
-    publishing.repositories.clear()
-
-    if (System.getenv('PR_NUMBER')) {
-        publishing {
-            repositories {
-                maven {
-                    name = 'LocalMaven'
-                    url = rootProject.layout.buildDirectory.dir('repo')
-                }
+if (System.getenv('PR_NUMBER')) {
+    publishing {
+        repositories {
+            maven {
+                name = 'LocalMaven'
+                url = rootProject.layout.buildDirectory.dir('repo')
             }
         }
-    } else if (System.getenv('SNAPSHOT_MAVEN_URL')) {
-        publishing {
-            repositories {
-                maven {
-                    name = 'PersonalMaven'
-                    url = uri(System.getenv('SNAPSHOT_MAVEN_URL'))
-                    credentials {
-                        username = System.getenv('MAVEN_USER')
-                        password = System.getenv('MAVEN_PASSWORD')
-                    }
+    }
+} else if (System.getenv('SNAPSHOT_MAVEN_URL')) {
+    publishing {
+        repositories {
+            maven {
+                name = 'PersonalMaven'
+                url = uri(System.getenv('SNAPSHOT_MAVEN_URL'))
+                credentials {
+                    username = System.getenv('MAVEN_USER')
+                    password = System.getenv('MAVEN_PASSWORD')
                 }
             }
         }
     }
-}
+}
+
+tasks.register('release') {
+    dependsOn('publishPlugins')
+}