core dependencies update (#109)

* kotlin version inc, serialization plugin version inc, gradle version inc

* version increment

* java toolchain

* tasks configuration update

* removed artifact provider

* CI java version to 17

* tests fix

* tests fix

* toolchain config simplify

---------

Co-authored-by: Den <[email protected]>

Author: foxwoosh

.github/workflows/install/action.yml

@@ -7,7 +7,7 @@ runs:
       uses: actions/[email protected]
       with:
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
         cache: 'gradle'
 
     - name: Install NDK

app/build.gradle

@@ -1,9 +1,10 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
+    namespace 'io.novasama.substrate_sdk_app'
+
     compileSdkVersion rootProject.compileVersion
     defaultConfig {
         minSdkVersion rootProject.minVersion
@@ -14,10 +15,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
+    kotlin {
+        jvmToolchain(17)
+    }
 
     buildTypes {
         debug {

build.gradle

@@ -1,15 +1,15 @@
 buildscript {
     ext {
         // App version
-        versionName = '2.7.1'
+        versionName = '2.7.2'
         versionCode = 1
 
         // SDK and tools
-        compileVersion = 28
+        compileVersion = 30
         minVersion = 21
-        targetVersion = 28
+        targetVersion = 30
 
-        kotlinVersion = '1.6.20'
+        kotlinVersion = '2.1.21'
 
         supportVersion = '1.0.0'
         constraintVersion = '1.1.3'
@@ -70,10 +70,10 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.10.0'
         classpath 'org.mozilla.rust-android-gradle:plugin:0.9.6'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
+        classpath 'io.github.gradle-nexus:publish-plugin:2.0.0'
     }
 }
 
@@ -106,22 +106,22 @@ configurations {
     ktlint
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
 
 dependencies {
     ktlint "com.pinterest:ktlint:0.40.0"
 }
 
-task ktlint(type: JavaExec, group: "verification") {
+tasks.register('ktlint', JavaExec) {
     description = "Check Kotlin code style."
     classpath = configurations.ktlint
     main = "com.pinterest.ktlint.Main"
     args "$project.rootDir/**/src/main/**/*.kt", "--reporter=plain", "--reporter=checkstyle,output=${buildDir}/reports/checkstyle/kotlin-checkstyle-report.xml"
 }
 
-task ktlintFormat(type: JavaExec, group: "formatting") {
+tasks.register('ktlintFormat', JavaExec) {
     description = "Fix Kotlin code style deviations."
     classpath = configurations.ktlint
     main = "com.pinterest.ktlint.Main"

gradle.properties

@@ -20,4 +20,7 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-signing.secretKeyRingFile=../signing/key.gpg
+signing.secretKeyRingFile=../signing/key.gpg
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

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.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

koltinx-serialization-scale/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.20'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '2.1.21'
 }
 
 apply from: '../maven-publish-helper.gradle'
@@ -15,6 +15,8 @@ publishing {
 }
 
 android {
+    namespace 'io.novasama.substrate_sdk_android.koltinx_serialization_scale'
+
     compileSdkVersion rootProject.compileVersion
 
     defaultConfig {
@@ -33,17 +35,17 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = '1.8'
+    kotlin {
+        jvmToolchain(17)
     }
 }
 
 dependencies {
-    api "org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.1"
+    api "org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.1"
 
     testImplementation jUnitDep
     testImplementation mockitoDep

maven-publish-helper.gradle

@@ -12,7 +12,7 @@
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-task androidJavadocs(type: Javadoc) {
+tasks.register('androidJavadocs', Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     android.libraryVariants.all { variant ->
@@ -23,12 +23,13 @@ task androidJavadocs(type: Javadoc) {
     exclude '**/R.html', '**/R.*.html', '**/index.html'
 }
 
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+tasks.register('androidJavadocsJar', Jar) {
+    dependsOn androidJavadocs
     archiveClassifier.set('javadoc')
     from androidJavadocs.destinationDir
 }
 
-task androidSourcesJar(type: Jar) {
+tasks.register('androidSourcesJar', Jar) {
     archiveClassifier.set('sources')
     from android.sourceSets.main.java.srcDirs
 }
@@ -47,9 +48,6 @@ afterEvaluate {
 
                 // Adds javadocs and sources as separate jars.
 //                artifact androidJavadocsJar
-                artifact(androidSourcesJar) {
-                    classifier 'sources'
-                }
 
                 version = android.defaultConfig.versionName // or just '1.0'
 

substrate-sdk-android/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
+
 apply from: '../maven-publish-helper.gradle'
 
 publishing {
@@ -14,6 +14,8 @@ publishing {
 }
 
 android {
+    namespace 'io.novasama.substrate_sdk_android'
+
     compileSdkVersion rootProject.compileVersion
 
     ndkVersion "26.1.10909125"
@@ -38,8 +40,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     sourceSets {
@@ -51,6 +53,10 @@ android {
             java.srcDirs += "$projectDir/src/testShared/java"
         }
     }
+
+    kotlin {
+        jvmToolchain(17)
+    }
 }
 
 cargo {
@@ -59,7 +65,7 @@ cargo {
     targets = ["arm", "arm64", "x86", "x86_64"]
 }
 
-tasks.whenTaskAdded { task ->
+tasks.configureEach { task ->
     if ((task.name == 'javaPreCompileDebug' || task.name == 'javaPreCompileRelease')) {
         task.dependsOn 'cargoBuild'
     }

substrate-sdk-android/src/main/java/io/novasama/substrate_sdk_android/extensions/Ethereum.kt

@@ -23,7 +23,7 @@ fun String.asEthereumAddress() = Ethereum.Address(this)
 private val ETHEREUM_ADDRESS_REGEX = "^0x[0-9a-f]{40}$".toRegex()
 
 fun Ethereum.Address.isValid(): Boolean {
-    val withoutChecksum = value.toLowerCase(Locale.ROOT)
+    val withoutChecksum = value.lowercase(Locale.ROOT)
 
     // value is hex string of 40 symbols
     if (!ETHEREUM_ADDRESS_REGEX.matches(withoutChecksum)) {
@@ -70,7 +70,7 @@ fun Ethereum.Address.toAccountId(): Ethereum.AccountId {
         throw Ethereum.InvalidChecksumException()
     }
 
-    val accountId = value.toLowerCase(Locale.ROOT).fromHex()
+    val accountId = value.lowercase(Locale.ROOT).fromHex()
 
     return Ethereum.AccountId(accountId)
 }

substrate-sdk-android/src/main/java/io/novasama/substrate_sdk_android/runtime/definitions/types/generics/ExtrinsicExt.kt

@@ -65,7 +65,7 @@ fun Extrinsic.Instance.tryExtractMultiSignature(): MultiSignature? {
     val value = enumEntry.value as? ByteArray ?: return null
 
     val encryptionType =
-        EncryptionType.fromStringOrNull(enumEntry.name.toLowerCase()) ?: return null
+        EncryptionType.fromStringOrNull(enumEntry.name.lowercase()) ?: return null
 
     return MultiSignature(encryptionType, value)
 }

substrate-sdk-android/src/main/java/io/novasama/substrate_sdk_android/wsrpc/socket/RpcSocket.kt

@@ -128,7 +128,7 @@ class RpcSocket(
     }
 
     private fun log(topic: String, message: Any?) {
-        logger?.log("\t[SOCKET][${topic.toUpperCase()}] $message")
+        logger?.log("\t[SOCKET][${topic.uppercase()}] $message")
     }
 
     private fun isBatchReply(response: String): Boolean {

substrate-sdk-android/src/test/java/io/novasama/substrate_sdk_android/common/Math.kt

@@ -3,9 +3,9 @@ package io.novasama.substrate_sdk_android.common
 /**
  * Complexity: O(n * log(n))
  */
-fun List<Double>.median(): Double = sorted().let {
+fun List<Long>.median(): Double = sorted().let {
     val middleRight = it[it.size / 2]
-    val middleLeft = it[(it.size - 1) / 2] // will be same as middleRight if list size is odd
+    val middleLeft = it[(it.size - 1) / 2]
 
-    (middleLeft + middleRight) / 2
+    (middleLeft + middleRight) / 2.0
 }

substrate-sdk-android/src/test/java/io/novasama/substrate_sdk_android/runtime/definitions/TypeDefinitionParserTest.kt

@@ -450,7 +450,7 @@ class TypeDefinitionParserTest {
         val parseTimes = (0..times).map {
             measureTime {
                 TypeDefinitionParser.parseBaseDefinitions(tree, v13Preset())
-            }.inMilliseconds
+            }.inWholeMilliseconds
         }
 
         println(parseTimes)

substrate-sdk-android/src/test/java/io/novasama/substrate_sdk_android/runtime/metadata/Metadata14Test.kt

@@ -65,7 +65,7 @@ class Metadata14Test {
                     metadataReader.metadata[RuntimeMetadataSchemaV14.lookup],
                     v14Preset()
                 )
-            }.inMilliseconds
+            }.inWholeMilliseconds
         }
         println("Median: ${parseTimes.median()} ms")
     }