Bump outdated deps

.editorconfig

@@ -7,6 +7,7 @@ insert_final_newline = true
 
 # be sure to update build.gradle.kts in the root as well,
 ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_chain_method_continuation = disabled
 ktlint_standard_filename = disabled
 ktlint_standard_import-ordering = disabled
 ktlint_standard_chain-wrapping = disabled

.github/workflows/ci-examples-pull-request.yml

@@ -24,9 +24,10 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v2
         with:
-          java-version: '21'
+          java-version: '21.0.1'
           java-package: jdk
-          distribution: 'adopt'
+          distribution: 'temurin'
+          architecture: 'x64'
 
       - name: Install flow emulator
         run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)"

.github/workflows/ci-sdk-pull-request.yml

@@ -24,9 +24,10 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v2
         with:
-          java-version: '21'
+          java-version: '21.0.1'
           java-package: jdk
-          distribution: 'adopt'
+          distribution: 'temurin'
+          architecture: 'x64'
 
       - name: Install flow emulator
         run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)"

build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 // Configuration variables
@@ -11,9 +12,9 @@ fun getProp(name: String, defaultValue: String? = null): String? {
 }
 
 plugins {
-    kotlin("jvm") version "1.9.22" apply false
-    id("org.jetbrains.dokka") version "1.9.10" apply false
-    id("org.jmailen.kotlinter") version "4.2.0" apply false
+    kotlin("jvm") version "2.0.21" apply false
+    id("org.jetbrains.dokka") version "2.0.0-Beta" apply false
+    id("org.jmailen.kotlinter") version "4.4.1" apply false
     id("kotlinx-serialization") version "1.8.0" apply false
     id("com.vanniktech.maven.publish") version "0.28.0" apply false
 }
@@ -24,7 +25,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
     }
 }
 
@@ -51,23 +52,30 @@ subprojects {
         else -> defaultVersion
     }
 
+    val intTestImplementation: Configuration by configurations.creating {
+        extendsFrom(configurations["implementation"])
+    }
+
+    val intTestRuntimeOnly: Configuration by configurations.creating {
+        extendsFrom(configurations["runtimeOnly"])
+    }
+
     tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_21.toString()
-            freeCompilerArgs = listOf("-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn")
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_21)
+            freeCompilerArgs.addAll("-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn")
         }
     }
 
     dependencies {
-        "api"("org.jetbrains.kotlin:kotlin-reflect:1.9.22")
-        "dokkaHtmlPlugin"("org.jetbrains.dokka:kotlin-as-java-plugin:1.9.10")
+        "api"("org.jetbrains.kotlin:kotlin-reflect:2.0.21")
+        //dokkaHtmlPlugin"("org.jetbrains.dokka:kotlin-as-java-plugin:2.0.0-Beta")
     }
 
     tasks.named<KotlinCompile>("compileTestKotlin") {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_21.toString()
-            freeCompilerArgs = listOf("-Xjvm-default=all", "-opt-in=com.squareup.kotlinpoet.metadata.KotlinPoetMetadataPreview")
-            allWarningsAsErrors = false
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)  // Set JVM target to 21
+            freeCompilerArgs.addAll("-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn")
         }
     }
 

common/build.gradle.kts

@@ -19,9 +19,9 @@ tasks.withType<JavaCompile> {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_21.toString()
-        freeCompilerArgs = listOf("-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn")
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)  // Set JVM target to 21
+        freeCompilerArgs.addAll("-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn")
     }
 }
 
@@ -34,37 +34,33 @@ repositories {
 
 dependencies {
     implementation(project(":sdk"))
-    testFixturesImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
-    testFixturesImplementation("org.mockito:mockito-core:3.12.4")
-    testFixturesImplementation("org.mockito:mockito-inline:3.11.2")
+
+    testImplementation("org.junit.jupiter:junit-jupiter:5.11.2")
+    testImplementation("org.mockito:mockito-core:5.14.1")
+    testImplementation("org.mockito:mockito-inline:5.14.1")
+
+    testFixturesImplementation(project(":sdk"))
+    testFixturesImplementation("org.junit.jupiter:junit-jupiter:5.11.2")
+    testFixturesImplementation("org.mockito:mockito-core:5.14.1")
+    testFixturesImplementation("org.mockito:mockito-inline:5.2.0")
+
+    intTestImplementation("org.junit.jupiter:junit-jupiter:5.11.2")
+    intTestImplementation("org.assertj:assertj-core:3.26.3")
+    intTestRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.test {
-    // Use junit platform for unit tests.
     useJUnitPlatform()
 }
 
 sourceSets {
     create("intTest") {
-        compileClasspath += sourceSets.main.get().output
-        runtimeClasspath += sourceSets.main.get().output
-        kotlin.srcDirs("src/intTest", "src/testFixtures")
+        compileClasspath += sourceSets["main"].output + sourceSets["testFixtures"].output
+        runtimeClasspath += sourceSets["main"].output + sourceSets["testFixtures"].output
+        kotlin.srcDirs("src/intTest/kotlin")
     }
 }
 
-val intTestImplementation by configurations.getting {
-    extendsFrom(configurations.implementation.get())
-}
-val intTestRuntimeOnly by configurations.getting
-
-configurations["intTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.get())
-
-dependencies {
-    intTestImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
-    intTestImplementation("org.assertj:assertj-core:3.25.1")
-    intTestRuntimeOnly("org.junit.platform:junit-platform-launcher")
-}
-
 val integrationTest = task<Test>("integrationTest") {
     description = "Runs integration tests."
     group = "verification"

common/src/testFixtures/kotlin/org/onflow/flow/common/test/FlowTestUtil.kt

@@ -28,16 +28,16 @@ object FlowTestUtil {
         val contractList = contracts.toList()
         val contractArgs = contractList
             .mapIndexed { i, c ->
-                c.args.entries.sortedBy { it.key }
+                c.args.entries
+                    .sortedBy { it.key }
                     .joinToString(separator = "") { ", contract${i}_${it.key}: ${it.value.type}" }
-            }
-            .joinToString(separator = "")
+            }.joinToString(separator = "")
         val contractAddArgs = contractList
             .mapIndexed { i, c ->
-                c.args.entries.sortedBy { it.key }
+                c.args.entries
+                    .sortedBy { it.key }
                     .joinToString(separator = "") { ", ${it.key}: contract${i}_${it.key}" }
-            }
-            .toList()
+            }.toList()
         val contractAdds = List(contractList.size) { i ->
             """
                     signer.contracts.add(
@@ -84,22 +84,23 @@ object FlowTestUtil {
         balance: BigDecimal = BigDecimal(0.01)
     ): FlowAccessApi.AccessApiCallResponse<FlowAddress> {
         val loadedScript = String(loadScript("cadence/test_utils_create_account.cdc"), StandardCharsets.UTF_8)
-        val transactionResult = api.simpleFlowTransaction(
-            address = serviceAccount.flowAddress,
-            signer = serviceAccount.signer,
-            keyIndex = serviceAccount.keyIndex
-        ) {
-            script {
-                loadedScript
-            }
-            gasLimit(5000)
-            arguments {
-                arg { ufix64(balance) }
-                arg { string(publicKey) }
-                arg { uint8(signAlgo.index) }
-                arg { uint8(hashAlgo.index) }
-            }
-        }.sendAndWaitForSeal()
+        val transactionResult = api
+            .simpleFlowTransaction(
+                address = serviceAccount.flowAddress,
+                signer = serviceAccount.signer,
+                keyIndex = serviceAccount.keyIndex
+            ) {
+                script {
+                    loadedScript
+                }
+                gasLimit(5000)
+                arguments {
+                    arg { ufix64(balance) }
+                    arg { string(publicKey) }
+                    arg { uint8(signAlgo.index) }
+                    arg { uint8(hashAlgo.index) }
+                }
+            }.sendAndWaitForSeal()
 
         return when (transactionResult) {
             is FlowAccessApi.AccessApiCallResponse.Success -> {
@@ -114,6 +115,7 @@ object FlowTestUtil {
 
                 FlowAccessApi.AccessApiCallResponse.Success(FlowAddress(address))
             }
+
             is FlowAccessApi.AccessApiCallResponse.Error -> FlowAccessApi.AccessApiCallResponse.Error("Failed to create account: ${transactionResult.message}", transactionResult.throwable)
         }
     }
@@ -202,8 +204,7 @@ object FlowTestUtil {
             (
                 listOf("${System.getProperty("user.home")}/.local/bin", "/usr/local/bin", "/usr/bin", "/bin")
                     + (System.getenv()["PATH"]?.split(File.pathSeparator) ?: emptyList())
-            )
-                .map { File(it, "flow") }
+            ).map { File(it, "flow") }
                 .find { it.exists() }
                 ?: throw IOException("flow command not found")
         }

gradle.properties

@@ -0,0 +1 @@
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

java-example/build.gradle.kts

@@ -1,9 +1,10 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     java
     application
-    kotlin("jvm") version "1.9.22"
+    kotlin("jvm") version "2.0.21"
 }
 
 // Helper function to get properties
@@ -19,9 +20,9 @@ tasks.withType<JavaCompile> {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_21.toString()
-        freeCompilerArgs = listOf("-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn")
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
+        freeCompilerArgs.addAll("-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn")
     }
 }
 
@@ -41,8 +42,8 @@ dependencies {
 
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.11.2")
 }
 
 application {

kotlin-example/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -19,9 +20,10 @@ tasks.withType<JavaCompile> {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_21.toString()
-        freeCompilerArgs = listOf("-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn")
+    incremental = false
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
+        freeCompilerArgs.addAll("-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn")
     }
 }
 
@@ -33,22 +35,19 @@ repositories {
 }
 
 dependencies {
-    // Use JUnit Jupiter Engine for testing.
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.11.2")
 
     implementation(project(":sdk"))
     implementation(project(":common"))
     testImplementation(testFixtures(project(":common")))
 }
 
 application {
-    // Define the main class for the application.
     mainClass.set("org.onflow.examples.kotlin.AccessAPIConnector")
 }
 
 tasks.test {
-    // Use junit platform for unit tests.
     useJUnitPlatform()
 }
 

kotlin-example/src/main/kotlin/org/onflow/examples/kotlin/ExamplesUtils.kt

@@ -10,13 +10,11 @@ object ExamplesUtils {
         return resource.use { it.readAllBytes() }
     }
 
-    fun loadScriptContent(path: String): String {
-        return String(loadScript(path), StandardCharsets.UTF_8)
-    }
+    fun loadScriptContent(path: String): String =
+        String(loadScript(path), StandardCharsets.UTF_8)
 
     fun ByteArray.toHexString() = joinToString("") { "%02x".format(it) }
 
-    fun ByteArray.toUnsignedByteArray(): ByteArray {
-        return this.map { (it.toInt() and 0xFF).toByte() }.toByteArray()
-    }
+    fun ByteArray.toUnsignedByteArray(): ByteArray =
+        this.map { (it.toInt() and 0xFF).toByte() }.toByteArray()
 }

kotlin-example/src/main/kotlin/org/onflow/examples/kotlin/deployContract/DeployContractExample.kt

@@ -24,7 +24,8 @@ internal class DeployContractExample(
         val payerAccountKey = connector.getAccountKey(payerAddress, 0)
         val signer = Crypto.getSigner(privateKey, payerAccountKey.hashAlgo)
 
-        val contractCode = ExamplesUtils.loadScriptContent(scriptName)
+        val contractCode = ExamplesUtils
+            .loadScriptContent(scriptName)
             .replace("\"", "\\\"") // Escape double quotes
             .replace("\n", "\\n") // Escape newlines