diff --git a/FtcRobotController/src/main/AndroidManifest.xml b/FtcRobotController/src/main/AndroidManifest.xml index 143c1f1..8ff3b6e 100644 --- a/FtcRobotController/src/main/AndroidManifest.xml +++ b/FtcRobotController/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="63" + android:versionName="11.2.1"> diff --git a/README.md b/README.md index e1e43ec..1209be9 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,11 @@ The readme.md file located in the [/TeamCode/src/main/java/org/firstinspires/ftc # Release Information +## Version 11.2.1 (20260724-093406) + +### Bug Fixes +* Fixes issue [2099](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues/2099). Gradle and the AGP are now updated to 9.1 and 8.13.2 respectively. + ## Version 11.2 (20260707-102819) ### Breaking Changes diff --git a/TeamCode/build.gradle b/TeamCode/build.gradle index 878287a..f7307a8 100644 --- a/TeamCode/build.gradle +++ b/TeamCode/build.gradle @@ -1,3 +1,5 @@ +apply plugin: 'com.android.application' + // // build.gradle in TeamCode // @@ -8,7 +10,6 @@ // please think carefully as to whether such customizations are really necessary // before doing so. - // Custom definitions may go here // Include common definitions from above. diff --git a/build.common.gradle b/build.common.gradle index a1d2fa4..c078f13 100644 --- a/build.common.gradle +++ b/build.common.gradle @@ -17,8 +17,6 @@ import java.util.regex.Pattern -apply plugin: 'com.android.application' - android { compileSdkVersion 30 diff --git a/build.dependencies.gradle b/build.dependencies.gradle index a01fe64..8989a4c 100644 --- a/build.dependencies.gradle +++ b/build.dependencies.gradle @@ -4,14 +4,14 @@ repositories { } dependencies { - implementation 'org.firstinspires.ftc:Inspection:11.2.0' - implementation 'org.firstinspires.ftc:Blocks:11.2.0' - implementation 'org.firstinspires.ftc:RobotCore:11.2.0' - implementation 'org.firstinspires.ftc:RobotServer:11.2.0' - implementation 'org.firstinspires.ftc:OnBotJava:11.2.0' - implementation 'org.firstinspires.ftc:Hardware:11.2.0' - implementation 'org.firstinspires.ftc:FtcCommon:11.2.0' - implementation 'org.firstinspires.ftc:Vision:11.2.0' + implementation 'org.firstinspires.ftc:Inspection:11.2.1' + implementation 'org.firstinspires.ftc:Blocks:11.2.1' + implementation 'org.firstinspires.ftc:RobotCore:11.2.1' + implementation 'org.firstinspires.ftc:RobotServer:11.2.1' + implementation 'org.firstinspires.ftc:OnBotJava:11.2.1' + implementation 'org.firstinspires.ftc:Hardware:11.2.1' + implementation 'org.firstinspires.ftc:FtcCommon:11.2.1' + implementation 'org.firstinspires.ftc:Vision:11.2.1' implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/build.gradle b/build.gradle index e70f209..a54f4fe 100644 --- a/build.gradle +++ b/build.gradle @@ -9,10 +9,12 @@ buildscript { mavenCentral() google() } - dependencies { - // Note for FTC Teams: Do not modify this yourself. - classpath 'com.android.tools.build:gradle:8.7.0' - } +} + +plugins { + // Note for FTC Teams: Do not modify this yourself. + id 'com.android.application' version '8.13.2' apply false + id 'com.android.library' version '8.13.2' apply false } // This is now required because aapt2 has to be downloaded from the diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 19cfad9..2e11132 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ 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-9.1.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 9e2cfb3..6c1211a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,10 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + include ':FtcRobotController' include ':TeamCode'