AS Flamingo

Jenkinsfile

@@ -1,6 +1,7 @@
 @Library('jenkins-library' ) _
 // Pipeline
 new org.android.ShareFeature().call(
+    dockerImage: "build-tools/android-build-box-jdk17:latest",
     lint: true,
     test: true
 )

app/build.gradle

@@ -13,17 +13,16 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+
     buildFeatures {
         compose true
     }
+
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.3'
+        kotlinCompilerExtensionVersion '1.4.6'
     }
 
     buildTypes {
@@ -42,12 +41,12 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation project(':fearless-utils')
     implementation "com.google.android.material:material:1.8.0"
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'androidx.activity:activity-compose:1.7.1'
 
-    implementation "androidx.compose.ui:ui:1.3.3"
-    implementation "androidx.compose.material:material:1.3.1"
-    implementation "androidx.compose.ui:ui-tooling-preview:1.3.3"
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.3"
-    debugImplementation "androidx.compose.ui:ui-tooling:1.3.3"
+    implementation "androidx.compose.ui:ui:1.4.2"
+    implementation "androidx.compose.material:material:1.4.2"
+    implementation "androidx.compose.ui:ui-tooling-preview:1.4.2"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.4.2"
+    debugImplementation "androidx.compose.ui:ui-tooling:1.4.2"
 }

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
         // App version
-        versionName = '1.0.119'
+        versionName = '1.0.120'
         versionCode = 1
 
         // SDK and tools
@@ -17,10 +17,10 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath 'org.mozilla.rust-android-gradle:plugin:0.9.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:1.8.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:1.8.20"
     }
 }
 

fearless-utils/build.gradle

@@ -23,18 +23,18 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
 
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
-    ndkVersion "21.3.6528147"
+    ndkVersion "25.2.9519653"
     //ndkVersion "22.1.7171670"
 
     sourceSets {
@@ -96,7 +96,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
 
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.mockito:mockito-inline:4.6.1"
+    testImplementation "org.mockito:mockito-inline:5.2.0"
 
     androidTestImplementation "androidx.test:runner:1.5.2"
     androidTestImplementation "org.mockito:mockito-android:4.5.0"

fearless-utils/src/main/java/jp/co/soramitsu/fearless_utils/extensions/Hex.kt

@@ -10,18 +10,7 @@ fun ByteArray.toHexString(withPrefix: Boolean = false): String {
     return if (withPrefix) return HEX_PREFIX + encoded else encoded
 }
 
-fun String.fromHex(): ByteArray {
-    return if (startsWith(HEX_PREFIX)) {
-        val prefixLength = HEX_PREFIX.length
-        val charArray = this.toCharArray()
-        val relevantChars = CharArray(charArray.size - prefixLength)
-        System.arraycopy(charArray, prefixLength, relevantChars, 0, relevantChars.size)
-        val hexStringWithoutPrefix = String(relevantChars)
-        Hex.decode(hexStringWithoutPrefix)
-    } else {
-        Hex.decode(this)
-    }
-}
+fun String.fromHex(): ByteArray = Hex.decode(removePrefix(HEX_PREFIX))
 
 fun String.requirePrefix(prefix: String) = if (startsWith(prefix)) this else prefix + this
 

gradle.properties

@@ -16,10 +16,13 @@ org.gradle.jvmargs=-Xmx2048m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-RELEASE_REPOSITORY_URL https://nexus.iroha.tech/repository/maven-soramitsu/
-SNAPSHOT_REPOSITORY_URL https://nexus.iroha.tech/repository/maven-soramitsu/
+RELEASE_REPOSITORY_URL=https://nexus.iroha.tech/repository/maven-soramitsu/
+SNAPSHOT_REPOSITORY_URL=https://nexus.iroha.tech/repository/maven-soramitsu/
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=true
+android.nonFinalResIds=true
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip