Build script fixed

Author: philips77

.github/ISSUE_TEMPLATE/bug_report.md

@@ -20,8 +20,8 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **Platform details:**
- - Device: [e.g. Pixel XL]
- - OS: [e.g. Android 8.0]
+ - Device: [e.g. Pixel 10]
+ - OS: [e.g. Android 16]
  - Library Version (or Commit)
 
 **Logs / Screenshots**

.github/workflows/deploy-all.yml

@@ -8,10 +8,14 @@ jobs:
   generateReadme:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: main
           fetch-depth: 0
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'jetbrains'
+          java-version: '21'
       - shell: bash
         # The script gets VERSION from the latest tag and replaces {{VERSION}} with it in
         # moustache/README.mo. Then, it commits the change using GitHub Action user.
@@ -28,10 +32,14 @@ jobs:
     needs: generateReadme
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: main
           fetch-depth: 0
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'jetbrains'
+          java-version: '21'
       - shell: bash
         env:
           # The following env variables are used by signing configuration in sample/build.gradle
@@ -50,7 +58,7 @@ jobs:
     needs: generateReadme
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: main
           fetch-depth: 0

.github/workflows/deploy-to-play-store.yml

@@ -5,9 +5,13 @@ jobs:
   deployAabToGooglePlayInternal:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'jetbrains'
+          java-version: '21'
       - shell: bash
         env:
           # The following env variables are used by signing configuration in sample/build.gradle

.github/workflows/generate-readme.yml

@@ -5,7 +5,7 @@ jobs:
   generateReadme:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - shell: bash

build.gradle

@@ -33,7 +33,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:8.10.0'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
-        classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
+        classpath 'io.github.gradle-nexus:publish-plugin:2.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

fastlane/Fastfile

@@ -19,8 +19,7 @@ platform :android do
 
   desc "Deploy libraries to Nexus."
   lane :deployNexus do
-    gradle(task: "publish")
-    gradle(task: "releaseStagingRepositories")
+    gradle(task: "publishToSonatype closeAndReleaseSonatypeStagingRepository")
   end
 
   desc "Deploy build to Internal channel."

gradle.properties

@@ -34,10 +34,9 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=trueandroid.useAndroidX=true
 android.useAndroidX=true
 
-# VERSION_NAME=3.2.0
 GROUP=no.nordicsemi.android
 
-POM_DESCRIPTION=BLE Mesh library for Android
+POM_DESCRIPTION=Bluetooth Mesh library for Android
 POM_URL=https://github.com/NordicSemiconductor/Android-nRF-Mesh-Library.git
 POM_SCM_URL=https://github.com/NordicSemiconductor/Android-nRF-Mesh-Library.git
 POM_SCM_CONNECTION=scm:git@github.com:NordicSemiconductor/Android-nRF-Mesh-Library.git

gradle/git-tag-version.gradle

@@ -1,13 +1,12 @@
 ext.getVersionCodeFromTags = { ->
     try {
-        def code = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'tag', '--list'
-            standardOutput = code
-        }
+        def listOfTags = providers
+                .exec { commandLine 'git', 'tag', '--list' }
+                .standardOutput
+                .asText.get()
         // There were 42 tags so far. The first version after release using this script will
         // have build version 100.
-        return (99 - 42) + code.toString().split("\n").size()
+        return (99 - 42) + listOfTags.split("\n").size()
     }
     catch (ignored) {
         return -1
@@ -16,14 +15,15 @@ ext.getVersionCodeFromTags = { ->
 
 ext.getVersionNameFromTags = { ->
     try {
-        def stdout = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'describe', '--tags', '--abbrev=0'
-            standardOutput = stdout
-        }
-        return stdout.toString().trim().split("%")[0]
+        def version = providers
+                .exec { commandLine 'git', 'describe', '--tags', '--abbrev=0' }
+                .standardOutput
+                .asText.get().trim()
+        // Version may have % to add additional information
+        return version.split("%")[0]
     }
     catch (ignored) {
+        ignored.printStackTrace()
         return null
     }
-}
+}

gradle/publish-root.gradle

@@ -13,6 +13,7 @@ nexusPublishing {
 
     repositories {
         sonatype {
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
             stagingProfileId = System.env.SONATYPE_STAGING_PROFILE_ID
             username = System.env.OSSR_USERNAME
             password = System.env.OSSR_PASSWORD