Bump versions

build.gradle

@@ -2,8 +2,8 @@ buildscript {
     Properties versionProperties = new Properties()
     versionProperties.load(new FileInputStream("$project.rootDir/version.properties"))
 
-    ext.kotlin_version = '1.3.50'
-    ext.agp_version = '4.0.1'
+    ext.kotlin_version = '2.1.0'
+    ext.agp_version = '8.7.1'
     ext.plugin_version = versionProperties.getProperty("version")
 
     repositories {

gradle/wrapper/gradle-wrapper.properties

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

plugin/build.gradle

@@ -2,8 +2,8 @@ import groovy.json.JsonBuilder
 import org.gradle.util.VersionNumber
 
 plugins {
-    id 'com.gradle.plugin-publish' version '0.14.0'
-    id "org.gradle.test-retry" version "1.2.0"
+    id 'com.gradle.plugin-publish' version '1.3.0'
+    id "org.gradle.test-retry" version "1.6.0"
 }
 
 apply plugin: "java-gradle-plugin"
@@ -12,12 +12,15 @@ apply plugin: "groovy"
 apply plugin: "kotlin"
 
 gradlePlugin {
+    website = 'https://github.com/mozilla/rust-android-gradle'
+    vcsUrl = 'https://github.com/mozilla/rust-android-gradle.git'
     plugins {
         rustAndroidGradlePlugin {
             id = 'org.mozilla.rust-android-gradle.rust-android'
             implementationClass = 'com.nishtahir.RustAndroidPlugin'
             displayName = 'Plugin for building Rust with Cargo in Android projects'
             description = 'A plugin that helps build Rust JNI libraries with Cargo for use in Android projects.'
+            tags = ['rust', 'cargo', 'android']
         }
     }
 }
@@ -61,20 +64,19 @@ dependencies {
     testImplementation "org.junit.jupiter:junit-jupiter-api"
 }
 
+
+compileJava {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "17"
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "17"
 }
 
-pluginBundle {
-    website = 'https://github.com/mozilla/rust-android-gradle'
-    vcsUrl = 'https://github.com/mozilla/rust-android-gradle.git'
-    tags = ['rust', 'cargo', 'android']
-}
-
-
 // Generate a json file that contains the matrix of Gradle and AGP versions to test against.
 def generatedResources = "$buildDir/generated-resources/main"
 tasks.register('generateVersions') {

plugin/src/main/groovy/com/nishtahir/Versions.groovy

@@ -1,11 +1,11 @@
 package com.nishtahir
 
-import com.google.common.collect.ImmutableMultimap
-import com.google.common.collect.ImmutableSortedSet
-import com.google.common.collect.Multimap
 import groovy.json.JsonSlurper
 import groovy.transform.CompileStatic
 import groovy.transform.TypeCheckingMode
+import org.gradle.internal.impldep.com.google.common.collect.ImmutableMultimap
+import org.gradle.internal.impldep.com.google.common.collect.ImmutableSortedSet
+import org.gradle.internal.impldep.com.google.common.collect.Multimap
 import org.gradle.util.GradleVersion
 import org.gradle.util.VersionNumber
 

plugin/src/main/kotlin/com/nishtahir/CargoBuildTask.kt

@@ -137,6 +137,9 @@ open class CargoBuildTask : DefaultTask() {
                             theCommandLine.add(features.featureSet.joinToString(" "))
                         }
                     }
+                    null -> {
+                        // Do nothing
+                    }
                 }
 
                 if (cargoExtension.profile != "debug") {

plugin/src/test/groovy/com/nishtahir/TestVersions.groovy

@@ -1,7 +1,7 @@
 package com.nishtahir
 
-import com.google.common.collect.ImmutableMultimap
-import com.google.common.collect.Multimap
+import org.gradle.internal.impldep.com.google.common.collect.ImmutableMultimap
+import org.gradle.internal.impldep.com.google.common.collect.Multimap
 import org.gradle.util.GradleVersion
 import org.gradle.util.VersionNumber
 

samples/app/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.agp_version = '7.0.0'
+    ext.agp_version = '8.7.1'
     repositories {
         google()
         maven {
@@ -16,13 +16,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
 
 android {
-    compileSdkVersion 27
-    ndkVersion "26.3.11579264"
+    ndkVersion "27.1.12297006"
+    namespace "com.nishtahir.androidrust"
 
     defaultConfig {
         applicationId "com.nishtahir.androidrust"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 35
+        compileSdk 35
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -50,14 +51,14 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    testImplementation 'junit:junit:4.12'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    testImplementation 'junit:junit:4.13.2'
 }
 
 afterEvaluate {
     // The `cargoBuild` task isn't available until after evaluation.
-    android.applicationVariants.all { variant ->
+    android.applicationVariants.configureEach { variant ->
         def productFlavor = ""
         variant.productFlavors.each {
             productFlavor += "${it.name.capitalize()}"

samples/app/gradle/wrapper/gradle-wrapper.properties

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