[Feat][SDK- 471] Update publishing

.github/scripts/release.sh

@@ -38,13 +38,9 @@ elif [[ -z $VERSION ]]; then
 elif ! [[ $VERSION =~ $SEMVER_REGEX ]]; then
   echo "Skipping release. Bad version used."
 else
-
-  if [[ ${BASH_REMATCH[5]} == 'SNAPSHOT' ]]; then
-    echo "Doing SNAPSHOT release..."
-    ./gradlew -Dorg.gradle.internal.http.socketTimeout=300000 -Dorg.gradle.internal.http.connectionTimeout=300000 publishToSonatype
-  else
-    echo "Doing release..."
-    ./gradlew -Dorg.gradle.internal.http.socketTimeout=300000 -Dorg.gradle.internal.http.connectionTimeout=300000 publishToSonatype closeAndReleaseRepository
-  fi
+  echo "Doing release with Vanniktech Maven Publish plugin..."
+  ./gradlew -Dorg.gradle.internal.http.socketTimeout=300000 \
+            -Dorg.gradle.internal.http.connectionTimeout=300000 \
+            publish
   echo "Release done!"
 fi

.github/workflows/ci.yml

@@ -6,9 +6,9 @@ on:
         required: true
       RELEASE_GPG_PRIVATE_KEY_PASSPHRASE:
         required: true
-      NEXUS_USERNAME:
+      MAVENCENTRAL_USERNAME:
         required: true
-      NEXUS_PASSWORD:
+      MAVENCENTRAL_PASSWORD:
         required: true
   push:
     branches: [ master ]
@@ -33,7 +33,7 @@ jobs:
       matrix:
         # Must upgrade Gradle before we can go past Java 15 here.
         # https://docs.gradle.org/current/userguide/compatibility.html
-        java: [ 8, 11 ]
+        java: [ 11, 17 ]
     steps:
       - uses: actions/checkout@v4
 
@@ -60,7 +60,7 @@ jobs:
           echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT}
 
       - name: Build
-        run: ./gradlew clean build
+        run: ./gradlew clean build --no-daemon
 
       - name: Upload build reports
         if: always()
@@ -70,39 +70,69 @@ jobs:
           path: |
             **/build/reports/*
 
+  build-android:
+    runs-on: ubuntu-22.04
+    name: Build Android module with Java 17
+    needs: [ validation ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Fetch git tags
+        run: ./.github/scripts/fetch_to_tag.sh
+
+      - name: Set up Java 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'zulu'
+          cache: 'gradle'
+
+      - name: Install Android SDK
+        run: |
+          ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-33" "build-tools;34.0.0"
+
+      - name: Build Android module
+        run: ./gradlew :rollbar-android:build
+
+      - name: Upload Android build reports
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-java17-build-reports
+          path: |
+            **/build/reports/*
+
   release:
     runs-on: ubuntu-22.04
     name: Release
     # It would be nice to run this as part of the build job, since it would be
     # faster and have less duplicated Yaml, it would not be possible to check
     # for all matrix results before publishing if this were just another step
     # in that job.
-    needs: [ build ]
+    needs: [ build, build-android ]
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up Java 11 for the Android SDK Manager
-        uses: actions/setup-java@v1
+      - name: Set up Java 17 for Android
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'zulu'
+          cache: 'gradle'
 
       - name: Install Android SDK
         run: |
-          echo "Android SDK Manager version: `${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version`"
-          ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-27" "build-tools;28.0.3"
+          ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-33" "build-tools;34.0.0"
 
-      - name: Set up Java 8 for the build
-        uses: actions/setup-java@v4
-        with:
-          java-version: 8
-          distribution: 'zulu'
-          cache: 'gradle'
+      - name: Configure Gradle properties
+        run: |
+          mkdir -p ~/.gradle
+          cat <<EOF >> ~/.gradle/gradle.properties
+          mavenCentralUsername=${{ secrets.MAVENCENTRAL_USERNAME }}
+          mavenCentralPassword=${{ secrets.MAVENCENTRAL_PASSWORD }}
+          signing.password=${{ secrets.RELEASE_GPG_PRIVATE_KEY_PASSPHRASE }}
+          signing.key=${{ secrets.RELEASE_GPG_PRIVATE_KEY }}
+          EOF
 
       - name: Release
-        env:
-          RELEASE_GPG_PRIVATE_KEY: ${{ secrets.RELEASE_GPG_PRIVATE_KEY }}
-          RELEASE_GPG_PRIVATE_KEY_PASSPHRASE: ${{ secrets.RELEASE_GPG_PRIVATE_KEY_PASSPHRASE }}
-          NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
-          NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
         run: |
           ./.github/scripts/release.sh

build-logic/conventions/build.gradle.kts

@@ -0,0 +1,23 @@
+plugins {
+    `kotlin-dsl`
+}
+
+group = "com.rollbar.buildlogic"
+
+repositories {
+    gradlePluginPortal()
+    mavenCentral()
+}
+
+dependencies {
+    implementation("com.vanniktech:gradle-maven-publish-plugin:0.34.0")
+}
+
+gradlePlugin {
+    plugins {
+        create("rollbar-release-plugin") {
+            id = "com.rollbar.conventions.release"
+            implementationClass = "RollbarPublishPlugin"
+        }
+    }
+}

build-logic/conventions/src/main/kotlin/RollbarPublishPlugin.kt

@@ -0,0 +1,61 @@
+import com.vanniktech.maven.publish.MavenPublishBaseExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class RollbarPublishPlugin : Plugin<Project> {
+    override fun apply(project: Project) {
+
+        project.pluginManager.withPlugin("com.android.library") {
+            applyPlugin(project)
+        }
+
+        project.plugins.withId("java-library") {
+            applyPlugin(project)
+        }
+
+    }
+
+    private fun applyPlugin(project: Project) {
+        project.plugins.apply("com.vanniktech.maven.publish")
+
+        project.extensions.configure(MavenPublishBaseExtension::class.java) {
+            pom {
+                name.set(project.findProperty("POM_NAME") as String)
+                description.set(project.findProperty("POM_DESCRIPTION") as String)
+                url.set(project.findProperty("POM_URL") as String)
+
+                licenses {
+                    license {
+                        name.set(project.findProperty("POM_LICENCE_NAME") as String)
+                        url.set(project.findProperty("POM_LICENCE_URL") as String)
+                        distribution.set(project.findProperty("POM_LICENCE_DIST") as String)
+                    }
+                }
+
+                developers {
+                    developer {
+                        id.set("rokob")
+                        name.set("Andrew Weiss")
+                    }
+                    developer {
+                        id.set("basoko")
+                        name.set("David Basoco")
+                    }
+                    developer {
+                        id.set("diegov")
+                        name.set("Diego Veralli")
+                    }
+                }
+
+                scm {
+                    url.set(project.findProperty("POM_SCM_URL") as String)
+                    connection.set(project.findProperty("POM_SCM_CONNECTION") as String)
+                    developerConnection.set(project.findProperty("POM_SCM_DEV_CONNECTION") as String)
+                }
+            }
+
+            publishToMavenCentral()
+            signAllPublications()
+        }
+    }
+}

build-logic/settings.gradle.kts

@@ -0,0 +1,10 @@
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "build-logic"
+
+include(":conventions")

build.gradle.kts

@@ -0,0 +1,62 @@
+plugins {
+    alias(rollbarlibs.plugins.androidLibrary) apply false
+    alias(rollbarlibs.plugins.vanniktech) apply false
+    alias(rollbarlibs.plugins.spotbugs) apply false
+    alias(rollbarlibs.plugins.revapi) apply false
+    id("com.rollbar.conventions.release") apply false
+}
+
+val versionName = rootProject.extra["VERSION_NAME"] as String
+
+allprojects {
+    version = versionName
+
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+subprojects {
+    val isExample = name.contains("examples") || parent?.name == "examples"
+    val isAndroid = name.contains("android")
+
+    if (isExample || isAndroid) {
+        return@subprojects
+    }
+
+    apply(plugin = "java-library")
+    apply(plugin = "com.rollbar.conventions.release")
+    apply(from = "$rootDir/gradle/quality.gradle")
+    apply(from = "$rootDir/gradle/compatibility.gradle")
+
+    repositories {
+        mavenCentral()
+    }
+
+    tasks.withType<Jar>().configureEach {
+        manifest {
+            attributes(
+                mapOf(
+                    "Implementation-Title" to project.name,
+                    "Implementation-Version" to versionName
+                )
+            )
+        }
+    }
+
+    dependencies {
+        add("testImplementation", "junit:junit:4.13.2")
+        add("testImplementation", "org.hamcrest:hamcrest-all:1.3")
+        add("testImplementation", "org.mockito:mockito-core:5.18.0")
+    }
+
+    tasks.withType<JavaCompile>().configureEach {
+        if (JavaVersion.current().isJava9Compatible) {
+            options.release.set(8)
+        } else {
+            sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+            targetCompatibility = JavaVersion.VERSION_1_8.toString()
+        }
+    }
+}

examples/rollbar-android/build.gradle

@@ -4,15 +4,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
     }
 }
 
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "30.0.3"
+    namespace 'com.rollbar.example.android'
+    compileSdkVersion = 33
     defaultConfig {
         applicationId "com.rollbar.example.android"
         minSdkVersion 21