Fix scripts android

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, web3j-android]
   pull_request:
     branches:
       - main

.github/workflows/release.yml

@@ -12,6 +12,7 @@ jobs:
       OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
       OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      ACTIONS_STEP_DEBUG: true
     steps:
       - uses: actions/checkout@v4
       - name: Build Workflow Dispatch

.gitignore

@@ -54,3 +54,5 @@ docs/build
 integration-tests/src/test/resources/quorum-test-network/logs
 
 **/lint-baseline.xml
+/local.properties
+**/*.pro

CHANGELOG.md

@@ -3,7 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [4.12.3]() (Upcoming)
+# [4.12.4-android]() (Upcoming)
+
+### Bug Fixes
+
+* Fix release scripts [#2138](https://github.com/hyperledger-web3j/web3j/pull/2138)
+
+### Features
+
+* 
+
+### BREAKING CHANGES
+
+* 
+
+# [4.12.3-android](https://github.com/hyperledger-web3j/web3j/releases/tag/v4.12.3-android) (2025-01-10)
 
 ### Bug Fixes
 
@@ -17,7 +31,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### BREAKING CHANGES
 
-*
+* Web3j android specific modules [#2110](https://github.com/hyperledger-web3j/web3j/pull/2110)
+* Web3j android specific modules [#2122](https://github.com/hyperledger-web3j/web3j/pull/2122)
 
 # [4.12.2](https://github.com/hyperledger/web3j/releases/tag/v4.12.2) (2024-09-18)
 

abi/build.gradle

@@ -1,33 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'maven-publish'
-}
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
 }
 
 android {

android-test-utils/build.gradle

@@ -1,33 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'maven-publish'
-}
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
 }
 
 android {
@@ -58,6 +30,8 @@ android {
     }
 }
 
+description 'web3j android test lib'
+
 dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.7.0'

besu/build.gradle

@@ -1,34 +1,7 @@
 plugins {
     id 'com.android.library'
-    id 'maven-publish'
 }
 
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
-}
 
 android {
     namespace 'org.web3j'
@@ -58,6 +31,8 @@ android {
     }
 }
 
+description 'web3j besu support project'
+
 dependencies {
     api project(':eea')
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'

build.gradle

@@ -75,7 +75,7 @@ allprojects {
         }
     }
 
-    if (project.name != 'integration-tests' && project.name != 'web3j') {
+    if (project.name != 'integration-tests' && project.name != 'web3j' && project.name != 'java-utils') {
         apply from: "$rootDir/gradle/publish/build.gradle"
     }
 }

codegen/build.gradle

@@ -1,34 +1,6 @@
 plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
-    id 'maven-publish'
-}
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
 }
 
 android {

codegen/src/main/java/org/web3j/codegen/SolidityFunctionWrapper.java

@@ -135,7 +135,7 @@ public class SolidityFunctionWrapper extends Generator {
                     + "or the "
                     + SolidityFunctionWrapperGenerator.class.getName()
                     + " in the \n"
-                    + "<a href=\"https://github.com/hyperledger/web3j/tree/main/codegen\">"
+                    + "<a href=\"https://github.com/hyperledger-web3j/web3j/tree/main/codegen\">"
                     + "codegen module</a> to update.\n";
 
     private final boolean useNativeJavaTypes;

contracts/build.gradle

@@ -1,33 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'maven-publish'
-}
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
 }
 
 android {

core/build.gradle

@@ -2,36 +2,7 @@ import java.text.SimpleDateFormat
 
 plugins {
     id 'com.android.library'
-    id 'org.ajoberstar.git-publish'
-    id 'maven-publish'
 }
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
-}
-
 
 android {
     namespace 'org.web3j'
@@ -133,31 +104,6 @@ ext {
     ghToken = System.getenv('GITHUB_TOKEN')
 }
 
-gitPublish {
-
-    if (ghToken) {
-        repoUri = "https://github.com/${docsPath}.git"
-    } else {
-        repoUri = "git@github.com:${docsPath}.git"
-    }
-
-    branch = 'main'
-
-    def coreDocs = files("${buildDir.path}/docs/javadoc/")
-
-    contents {
-        from(coreDocs) {
-            into '/docs/javadoc-api'
-        }
-    }
-
-    preserve {
-        include '/**'
-    }
-
-    commitMessage = 'Publishing a new page'
-}
-
 // Define the testArtifacts configuration
 configurations {
     testArtifacts.extendsFrom testImplementation // or testRuntime

crypto/build.gradle

@@ -1,33 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'maven-publish'
-}
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
 }
 
 android {

eea/build.gradle

@@ -1,33 +1,5 @@
 plugins {
     id 'com.android.library' // Android library plugin for Android compatibility
-    id 'maven-publish'
-}
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
 }
 
 android {

geth/build.gradle

@@ -1,34 +1,7 @@
 plugins {
     id 'com.android.library' // Android library plugin for Android compatibility
-    id 'maven-publish'
 }
 
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
-}
 
 android {
     namespace 'com.org.web3j'

gradle/publish/build.gradle

@@ -1,11 +1,16 @@
+apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
-apply plugin: "de.marcphilipp.nexus-publish"
+apply plugin: 'de.marcphilipp.nexus-publish'
 
 publishing {
     publications {
-        maven(MavenPublication) {
+        release(MavenPublication) {
+            groupId = group
+            artifactId = project.name
+            version = version
 
+            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
             pom {
                 name = project.name
                 description.set(project.provider({ project.description }))
@@ -24,9 +29,9 @@ publishing {
                         slug = project.rootProjectOverride
                     }
 
-                    url = "https://github.com/hyperledger/$slug"
-                    connection = "scm:https://github.com/hyperledger/${slug}.git"
-                    developerConnection = "scm:git://github.com/hyperledger/${slug}.git"
+                    url = "https://github.com/hyperledger-web3j/$slug"
+                    connection = "scm:https://github.com/hyperledger-web3j/${slug}.git"
+                    developerConnection = "scm:git://github.com/hyperledger-web3j/${slug}.git"
                 }
 
                 developers {
@@ -39,6 +44,11 @@ publishing {
             }
         }
     }
+
+//        uncomment for local publish
+//        repositories {
+//            mavenLocal()
+//        }
 }
 
 nexusPublishing {
@@ -57,9 +67,25 @@ nexusStaging {
     packageGroup = rootProject.group
 }
 
+afterEvaluate {
+    tasks.withType(PublishToMavenRepository).configureEach {
+        dependsOn('bundleReleaseAar')
+    }
+}
+
+
+tasks.named('publish') {
+    dependsOn('assembleRelease')
+}
+
 signing {
-    sign publishing.publications.maven
+    sign publishing.publications.release
     def gpgSecretKey = System.getenv('OSSRH_GPG_SECRET_KEY')
     def password = System.getenv('OSSRH_GPG_SECRET_KEY_PASSWORD')
     useInMemoryPgpKeys(gpgSecretKey, password)
 }
+
+tasks.named('signReleasePublication') {
+    dependsOn('bundleReleaseAar')
+}
+

hosted-providers/build.gradle

@@ -1,33 +1,5 @@
 plugins {
     id 'com.android.library' // Android library plugin for Android compatibility
-    id 'maven-publish'
-}
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
 }
 
 android {

integration-tests/build.gradle

@@ -1,22 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'maven-publish'
-}
-
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = 'org.web3j'
-            artifactId = 'integration-tests'
-            version = '4.12.4'
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
 }
 
 description 'web3j integration tests'

parity/build.gradle

@@ -1,34 +1,7 @@
 plugins {
     id 'com.android.library'
-    id 'maven-publish'
 }
 
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
-}
 description 'Parity JSON-RPC API'
 
 android {

rlp/build.gradle

@@ -1,33 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'maven-publish'
-}
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
 }
 
 android {

tuples/build.gradle

@@ -1,33 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'maven-publish'
-}
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
 }
 
 android {

utils/build.gradle

@@ -1,33 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'maven-publish'
-}
-
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId = group
-            artifactId = project.name
-            version = version
-
-            artifact("$buildDir/outputs/aar/${project.name}-release.aar")
-
-            pom {
-                withXml {
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    configurations.api.allDependencies.each { dependency ->
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', dependency.group)
-                        dependencyNode.appendNode('artifactId', dependency.name)
-                        dependencyNode.appendNode('version', dependency.version)
-                    }
-                }
-            }
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
 }
 
 android {