diff --git a/samples/android/java/app/build.gradle b/samples/android/java/app/build.gradle index 78a7817..4a2121c 100644 --- a/samples/android/java/app/build.gradle +++ b/samples/android/java/app/build.gradle @@ -16,12 +16,12 @@ dependencies { //JNI code generator annotationProcessor("io.github.gershnik:smjni-jnigen-processor:${gradle.ext.jniGenVersion}") - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.4' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } diff --git a/samples/android/java/build.gradle b/samples/android/java/build.gradle index 0521cda..de0c8f8 100644 --- a/samples/android/java/build.gradle +++ b/samples/android/java/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/samples/android/java/gradle/wrapper/gradle-wrapper.properties b/samples/android/java/gradle/wrapper/gradle-wrapper.properties index e2f6945..69650c9 100644 --- a/samples/android/java/gradle/wrapper/gradle-wrapper.properties +++ b/samples/android/java/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 30 19:18:56 PST 2022 +#Sat Apr 01 03:05:06 PDT 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/samples/android/kotlin-kapt/app/build.gradle b/samples/android/kotlin-kapt/app/build.gradle index 083760a..1f9cff8 100644 --- a/samples/android/kotlin-kapt/app/build.gradle +++ b/samples/android/kotlin-kapt/app/build.gradle @@ -19,12 +19,12 @@ dependencies { kapt("io.github.gershnik:smjni-jnigen-processor:${gradle.ext.jniGenVersion}") implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.4' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } android { @@ -58,8 +58,8 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = '1.8' + kotlin { + jvmToolchain(8) } externalNativeBuild { cmake { @@ -79,7 +79,7 @@ kapt { } } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +tasks.withType(org.jetbrains.kotlin.gradle.internal.KaptWithoutKotlincTask).all { outputs.upToDateWhen { def jniGenOutputList = file("${jniGenProps.generatedPath}/${jniGenProps.outputListName}") diff --git a/samples/android/kotlin-kapt/build.gradle b/samples/android/kotlin-kapt/build.gradle index 116b121..1a03225 100644 --- a/samples/android/kotlin-kapt/build.gradle +++ b/samples/android/kotlin-kapt/build.gradle @@ -5,8 +5,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.3.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20" + classpath "com.android.tools.build:gradle:7.4.2" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/samples/android/kotlin-kapt/gradle/wrapper/gradle-wrapper.properties b/samples/android/kotlin-kapt/gradle/wrapper/gradle-wrapper.properties index e2f6945..47153b7 100644 --- a/samples/android/kotlin-kapt/gradle/wrapper/gradle-wrapper.properties +++ b/samples/android/kotlin-kapt/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 30 19:18:56 PST 2022 +#Sat Apr 01 02:06:58 PDT 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/samples/android/kotlin-ksp/app/build.gradle b/samples/android/kotlin-ksp/app/build.gradle index 139a7f4..4f2b657 100644 --- a/samples/android/kotlin-ksp/app/build.gradle +++ b/samples/android/kotlin-ksp/app/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'com.google.devtools.ksp' version "1.7.20-1.0.8" + id 'com.google.devtools.ksp' version "1.8.0-1.0.9" } //JniGen settings @@ -19,12 +19,12 @@ dependencies { ksp("io.github.gershnik:smjni-jnigen-kprocessor:${gradle.ext.jniGenVersion}") implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.4' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } android { @@ -58,8 +58,8 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = '1.8' + kotlin { + jvmToolchain(8) } externalNativeBuild { cmake { @@ -76,7 +76,7 @@ ksp { arg("smjni.jnigen.expose.extra", jniGenProps.additionalClasses.join(";").toString()) } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { +tasks.withType(com.google.devtools.ksp.gradle.KspTaskJvm).all { outputs.upToDateWhen { def jniGenOutputList = file("${jniGenProps.generatedPath}/${jniGenProps.outputListName}") diff --git a/samples/android/kotlin-ksp/build.gradle b/samples/android/kotlin-ksp/build.gradle index 116b121..1a03225 100644 --- a/samples/android/kotlin-ksp/build.gradle +++ b/samples/android/kotlin-ksp/build.gradle @@ -5,8 +5,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.3.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20" + classpath "com.android.tools.build:gradle:7.4.2" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/samples/android/kotlin-ksp/gradle/wrapper/gradle-wrapper.properties b/samples/android/kotlin-ksp/gradle/wrapper/gradle-wrapper.properties index e2f6945..77d76d1 100644 --- a/samples/android/kotlin-ksp/gradle/wrapper/gradle-wrapper.properties +++ b/samples/android/kotlin-ksp/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 30 19:18:56 PST 2022 +#Fri Mar 31 23:24:21 PDT 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/samples/common.gradle b/samples/common.gradle index 43bc63e..7c80378 100644 --- a/samples/common.gradle +++ b/samples/common.gradle @@ -1,4 +1,4 @@ -gradle.ext.jniGenVersion = '3.6' +gradle.ext.jniGenVersion = '3.7' gradle.ext.cmakeVersion = '3.22.1' gradle.ext.compileSdk = 33 gradle.ext.minSdk = 21