Upgrade Gradle, Kotlin, ProtobufJS

.circleci/config.yml

@@ -51,12 +51,12 @@ jobs:
  - run:
  name: Install protobufjs
  command: |
- npm install protobufjs@6.11.3
+ npm install protobufjs@7.2.6
 
  - run:
  name: Install long.js
  command: |
- npm install [email protected].0
+ npm install [email protected].3
 
  - run:
  name: Install Firefox
@@ -114,12 +114,12 @@ jobs:
  - run:
  name: Install protobufjs
  command: |
- npm install protobufjs@6.11.3
+ npm install protobufjs@7.2.6
 
  - run:
  name: Install long.js
  command: |
- npm install [email protected].0
+ npm install [email protected].3
 
  - run:
  name: Install Firefox

buildSrc/src/main/kotlin/AndroidCompatibility.kt

@@ -15,19 +15,13 @@
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import ru.vyarus.gradle.plugin.animalsniffer.AnimalSnifferExtension
 import ru.vyarus.gradle.plugin.animalsniffer.AnimalSnifferPlugin
 
 fun Project.compatibleWithAndroid(api: Int = 19) {
  apply<AnimalSnifferPlugin>()
 
- configure<AnimalSnifferExtension> {
- toolVersion = "1.21"
- }
-
  dependencies {
- add("signature", "com.toasttab.android:gummy-bears-api-$api:0.4.0@signature")
+ add("signature", "com.toasttab.android:gummy-bears-api-$api:${libs.versions.gummyBears.get()}@signature")
  }
 }

buildSrc/src/main/kotlin/protokt.multiplatform-conventions.gradle.kts

@@ -47,6 +47,11 @@ kotlin {
  compilations.all {
  kotlinOptions {
  allWarningsAsErrors = true
+ // expect / actual classes are in Beta and emit a warning in Kotlin 1.9.20
+ // see https://youtrack.jetbrains.com/issue/KT-61573
+ freeCompilerArgs += "-Xexpect-actual-classes"
+ languageVersion = "1.8"
+ apiVersion = "1.8"
  }
  }
  }
@@ -55,7 +60,7 @@ kotlin {
  kotlinOptions {
  // do not generate DefaultImpls objects since we do not target < JVM 1.8
  // https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-m3-generating-default-methods-in-interfaces
- freeCompilerArgs = listOf("-Xjvm-default=all")
+ freeCompilerArgs += "-Xjvm-default=all"
  }
  }
  }

gradle-plugin-integration-test/multiplatform/build.gradle.kts

@@ -69,6 +69,15 @@ kotlin {
  freeCompilerArgs = listOf("-Xjvm-default=all")
  }
  }
+
+ all {
+ compilations.all {
+ kotlinOptions {
+ languageVersion = "1.8"
+ apiVersion = "1.8"
+ }
+ }
+ }
  }
 }
 

gradle/libs.versions.toml

@@ -21,18 +21,19 @@ kotlinx-coroutines = "1.6.0"
 kotlinx-serialization = "1.5.1"
 ktlint = "1.0.0"
 protobuf-java = "3.21.7"
-protobuf-js = "6.11.3"
+protobuf-js = "7.2.6"
 protobufGradlePlugin = "0.9.4"
 slf4j = "2.0.6"
 
 # build
 androidGradlePlugin = "7.4.2"
-animalSnifferGradlePlugin = "1.5.4"
+animalSnifferGradlePlugin = "1.7.1"
 binaryCompatibilityValidator = "0.13.2"
 buildConfig = "3.1.0"
 gradleMavenPublishPlugin = "0.25.3"
+gummyBears = "0.8.0"
 java = "11"
-kotlin = "1.9.10"
+kotlin = "1.9.23"
 pluginPublish = "1.2.1"
 spotless = "6.21.0"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists