QPC-github
diff --git a/‎api-common-java/.github/workflows/ci.yaml‎
Lines changed: 1 addition & 1 deletion b/‎api-common-java/.github/workflows/ci.yaml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎api-common-java/build.gradle‎
Lines changed: 20 additions & 15 deletions b/‎api-common-java/build.gradle‎
Lines changed: 20 additions & 15 deletions
diff --git a/‎api-common-java/gradle/wrapper/gradle-wrapper.jar‎
10.8 KB b/‎api-common-java/gradle/wrapper/gradle-wrapper.jar‎
10.8 KB
diff --git a/‎api-common-java/gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 2 additions & 2 deletions b/‎api-common-java/gradle/wrapper/gradle-wrapper.properties‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎api-common-java/gradlew‎
Lines changed: 67 additions & 48 deletions b/‎api-common-java/gradlew‎
Lines changed: 67 additions & 48 deletions
diff --git a/‎api-common-java/gradlew.bat‎
Lines changed: 23 additions & 10 deletions b/‎api-common-java/gradlew.bat‎
Lines changed: 23 additions & 10 deletions
@@ -22,7 +22,7 @@ jobs:
     - name: Gradle Test
       run: ./gradlew test
     - name: Gradle Build
-      run: ./gradlew build install
+      run: ./gradlew build
   format:
     runs-on: ubuntu-latest
     steps:
 
@@ -10,19 +10,18 @@ buildscript {
   }
   dependencies {
     classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9",
-      "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0"
+      "io.github.gradle-nexus:publish-plugin:1.1.0"
   }
 }
-
 apply plugin: 'java'
-apply plugin: 'maven'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'jacoco'
 apply plugin: 'signing'
 apply plugin: 'maven-publish'
 apply plugin: 'com.github.sherter.google-java-format'
-apply plugin: 'io.codearte.nexus-staging'
+apply plugin: 'io.github.gradle-nexus.publish-plugin'
+
 
 group = "com.google.api"
 archivesBaseName = "api-common"
@@ -64,15 +63,15 @@ dependencies {
 
   annotationProcessor libraries.auto_value
 
-  compile libraries.guava,
+  implementation( libraries.guava,
     libraries.jsr305,
     libraries.javax_annotations,
-    libraries.auto_value_annotations
+    libraries.auto_value_annotations)
 
   compileOnly libraries.error_prone_annotations
 
-  testCompile libraries.junit,
-    libraries.truth
+  testImplementation(libraries.junit,
+    libraries.truth)
 }
 
 clean.doFirst {
@@ -97,7 +96,9 @@ jar {
 
 // Source jar
 // ----------
-
+project.gradle.taskGraph.whenReady {
+  println project.gradle.taskGraph.getAllTasks()
+}
 task sourcesJar(type: Jar, dependsOn: classes) {
   classifier = 'sources'
   from sourceSets.main.allSource
@@ -161,7 +162,7 @@ configurations {
 
 dependencies {
   codeGeneration libraries.auto_value, libraries.jsr305
-  compile libraries.jsr305, libraries.auto_value_annotations
+  implementation(libraries.jsr305, libraries.auto_value_annotations)
 }
 
 compileJava.classpath += configurations.codeGeneration
@@ -214,18 +215,22 @@ artifacts {
 }
 
 signing {
-  required { gradle.taskGraph.hasTask("uploadArchives") }
+  required { gradle.taskGraph.hasTask("publishToSonatype") }
   if (project.hasProperty('signing.gnupg.executable')) {
     useGpgCmd()
   }
   sign configurations.archives
 }
 
 if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
-  nexusStaging {
-    username = ossrhUsername
-    password = ossrhPassword
+  nexusPublishing {
     packageGroup = "com.google.api"
+    repositories {
+      sonatype {   //or custom repository name
+        username = ossrhUsername
+        password = ossrhPassword
+      }
+    }
   }
 }
 
@@ -422,7 +427,7 @@ task stageRelease {
     exec {
       // We need to spawn a new gradle build process in order to upload appropriately
       // More details: http://stackoverflow.com/questions/31614735/gradle-uploadarchives-artificats-namespace-when-depending-on-a-plugin
-      commandLine './gradlew', 'uploadArchives'
+      commandLine './gradlew', 'publishToSonatype', 'closeAndReleaseSonatypeStagingRepository'
     }
   }
 }
 
@@ -1,6 +1,6 @@
-#Tue Sep 20 10:02:51 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+# pinning this at 6.9.1 because gradle-7.0 and above do not support the necessary groovy imports.
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip