Merge pull request #2122 from shashankiitbhu/web3j-fix-android

Web3j fix android

Author: gtebrean

.github/workflows/build.yml

@@ -4,7 +4,9 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - web3j-android
   workflow_dispatch:
 
 jobs:

.github/workflows/codeql.yml

@@ -5,7 +5,9 @@ on:
     branches: [ 'main' ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ 'main' ]
+    branches:
+      - main
+      - web3j-android
   schedule:
     - cron: '35 2 * * 3'
 

.github/workflows/publish-snapshot.yml

@@ -3,7 +3,9 @@ name: Publish snapshot
 on:
   workflow_run:
     workflows: [ 'Build' ]
-    branches: [ main ]
+    branches:
+      - main
+      - web3j-android
     types: [ completed ]
 
 jobs:

.gitignore

@@ -51,4 +51,6 @@ docs/build
 **/bin
 
 # Besu-dev-quickstart logs
-integration-tests/src/test/resources/quorum-test-network/logs
+integration-tests/src/test/resources/quorum-test-network/logs
+
+**/lint-baseline.xml

.kotlin/errors/errors-1732031657319.log

@@ -0,0 +1,4 @@
+kotlin version: 2.0.21
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+

.kotlin/errors/errors-1733489503716.log

@@ -0,0 +1,4 @@
+kotlin version: 2.0.21
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+

abi/build.gradle

@@ -1,5 +1,33 @@
 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 {
@@ -9,8 +37,6 @@ android {
     defaultConfig {
         minSdkVersion 24
         targetSdkVersion 33
-
-
     }
 
     lint {

abi/src/main/java/org/web3j/abi/TypeDecoder.java

@@ -151,9 +151,9 @@ public static <T extends NumericType> T decodeNumeric(String input, Class<T> typ
 
             BigInteger numericValue;
             if (Uint.class.isAssignableFrom(type) || Ufixed.class.isAssignableFrom(type)) {
-                numericValue = new BigInteger(1, inputByteArray, valueOffset, typeLengthAsBytes);
+                numericValue = new BigInteger(1, Arrays.copyOfRange(inputByteArray, valueOffset, valueOffset + typeLengthAsBytes));
             } else {
-                numericValue = new BigInteger(inputByteArray, valueOffset, typeLengthAsBytes);
+                numericValue = new BigInteger(Arrays.copyOfRange(inputByteArray, valueOffset, valueOffset + typeLengthAsBytes));
             }
             return type.getConstructor(BigInteger.class).newInstance(numericValue);
 

android-test-utils/build.gradle

@@ -1,5 +1,33 @@
 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 {
@@ -19,6 +47,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    lint {
+        baseline = file("lint-baseline.xml")
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

besu/build.gradle

@@ -1,5 +1,33 @@
 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 {

build.gradle

@@ -1,23 +1,24 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'java'
-    id 'idea'
+    id 'com.android.library' version '8.5.1' apply false
     id 'org.sonarqube' version '5.0.0.4638'
     id 'jacoco'
     id 'com.diffplug.spotless' version '6.25.0'
     id 'io.codearte.nexus-staging' version '0.30.0'
     id 'de.marcphilipp.nexus-publish' version '0.4.0'
     id 'de.undercouch.download' version '4.1.2'
     id 'org.ajoberstar.git-publish' version '3.0.1'
+    id 'com.android.application' version '8.5.1' apply false
+    id 'org.jetbrains.kotlin.android' version '2.0.21' apply false
+    id 'maven-publish'
 }
 
-
-
 ext {
     bouncycastleVersion = '1.78.1'
     jacksonVersion = '2.17.1'
     javaPoetVersion = '1.13.0'
-    kotlinVersion = '1.9.24'
-    kotlinPoetVersion = '1.16.0'
+    kotlinVersion = '2.0.0'
+    kotlinPoetVersion = '2.0.0'
     jnr_unixsocketVersion = '0.38.22'
     okhttpVersion = '4.12.0'
     rxjavaVersion = '2.2.21'
@@ -26,7 +27,6 @@ ext {
     picocliVersion = '4.7.6'
     ensAdraffyVersion = '0.2.0'
     kzg4844Version = '2.0.0'
-    awsSdkVersion = '2.27.24'
     tuweniVersion = '2.4.2'
     // test dependencies
     equalsverifierVersion = '3.16.1'
@@ -38,46 +38,27 @@ ext {
     junitPlatformLauncherVersion = '1.5.2'
 }
 
-
-description 'Web3j base project.'
-
-[
-    'jacoco',
-    'java',
-    'javadoc',
-    'publish',
-    'repositories',
-    'spotless'
-].each { buildScript ->
-    download {
-        src "https://raw.githubusercontent.com/hyperledger/web3j-build-tools/main/gradle/$buildScript/build.gradle"
-        dest "$rootDir/gradle/$buildScript/build.gradle"
-        overwrite false
-        quiet true
-        onlyIfModified true
-    }
-}
-
 allprojects {
     apply {
         [
-            'java',
-            'javadoc',
-            'repositories',
-            'spotless'
+                'repositories'
         ].each { buildScript ->
             from("$rootDir/gradle/$buildScript/build.gradle")
         }
     }
 
+    repositories {
+        google()
+        mavenCentral()
+    }
+
     tasks.withType(Test) {
         reports.html.destination = file("${reporting.baseDir}/${name}")
         useJUnitPlatform()
     }
 
+
     dependencies {
-        testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
-        testImplementation "org.mockito:mockito-junit-jupiter:$mockitoJunitVersion"
 
         configurations.all {
             resolutionStrategy {
@@ -98,10 +79,3 @@ allprojects {
         apply from: "$rootDir/gradle/publish/build.gradle"
     }
 }
-configure(subprojects.findAll { it.name != 'integration-tests' }) {
-    apply from: "$rootDir/gradle/jacoco/build.gradle"
-}
-
-
-tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle") }
-tasks.named("spotlessKotlin").configure { dependsOn("spotlessJava", "spotlessGroovyGradle") }

codegen/build.gradle

@@ -1,14 +1,42 @@
 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 {
     namespace 'com.org.web3j'
     compileSdkVersion 34
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 34
 
     }
@@ -29,9 +57,10 @@ android {
         test {
             java.srcDirs = ['src/test/java']
         }
+
     }
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = "17"
     }
 }
 
@@ -49,11 +78,15 @@ dependencies {
     //testImplementation project(':core').sourceSets.test.output
     testImplementation "ch.qos.logback:logback-core:$logbackVersion"
     testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
+    testImplementation 'org.mockito:mockito-core:5.5.0'
+    testImplementation 'org.mockito:mockito-junit-jupiter:5.5.0'
 
     implementation "org.junit.platform:junit-platform-launcher:$junitPlatformLauncherVersion"
     implementation "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
     implementation "org.junit.vintage:junit-vintage-engine:$junitVersion"
+//    implementation 'org.eclipse.jdt:org.eclipse.jdt.core:3.32.0'
     testImplementation project(':android-test-utils')
 }