Merge SDK v10.1.1

wheelerrobotics · Nov 9, 2024 · f63d1bc · f63d1bc
2 parents 8e7870f + ee16f8e
commit f63d1bc
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/FtcRobotController/build.gradle b/FtcRobotController/build.gradle
@@ -14,7 +14,11 @@ android {
         buildConfigField "String", "APP_BUILD_TIME", '"' + (new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.ROOT).format(new Date())) + '"'
     }
 
-    compileSdkVersion 29
+    buildFeatures {
+        buildConfig = true
+    }
+
+    compileSdkVersion 30
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/FtcRobotController/src/main/AndroidManifest.xml b/FtcRobotController/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="56"
-          android:versionName="10.1">
+    android:versionCode="57"
+          android:versionName="10.1.1">
 
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 

diff --git a/build.common.gradle b/build.common.gradle
@@ -21,7 +21,7 @@ apply plugin: 'com.android.application'
 
 android {
 
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     signingConfigs {
         release {
@@ -109,10 +109,6 @@ android {
     packagingOptions {
         pickFirst '**/*.so'
     }
-    sourceSets.main {
-        jni.srcDirs = []
-        jniLibs.srcDir rootProject.file('libs')
-    }
     ndkVersion '21.3.6528147'
 }
 

diff --git a/build.dependencies.gradle b/build.dependencies.gradle
@@ -4,14 +4,14 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.firstinspires.ftc:Inspection:10.1.0'
-    implementation 'org.firstinspires.ftc:Blocks:10.1.0'
-    implementation 'org.firstinspires.ftc:RobotCore:10.1.0'
-    implementation 'org.firstinspires.ftc:RobotServer:10.1.0'
-    implementation 'org.firstinspires.ftc:OnBotJava:10.1.0'
-    implementation 'org.firstinspires.ftc:Hardware:10.1.0'
-    implementation 'org.firstinspires.ftc:FtcCommon:10.1.0'
-    implementation 'org.firstinspires.ftc:Vision:10.1.0'
+    implementation 'org.firstinspires.ftc:Inspection:10.1.1'
+    implementation 'org.firstinspires.ftc:Blocks:10.1.1'
+    implementation 'org.firstinspires.ftc:RobotCore:10.1.1'
+    implementation 'org.firstinspires.ftc:RobotServer:10.1.1'
+    implementation 'org.firstinspires.ftc:OnBotJava:10.1.1'
+    implementation 'org.firstinspires.ftc:Hardware:10.1.1'
+    implementation 'org.firstinspires.ftc:FtcCommon:10.1.1'
+    implementation 'org.firstinspires.ftc:Vision:10.1.1'
     implementation 'androidx.appcompat:appcompat:1.2.0'
 }
 
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
     dependencies {
         // Note for FTC Teams: Do not modify this yourself.
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:8.7.0'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -8,3 +8,5 @@ android.enableJetifier=false
 
 # Allow Gradle to use up to 1 GB of RAM
 org.gradle.jvmargs=-Xmx1024M
+
+android.nonTransitiveRClass=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,5 @@ android.enableJetifier=false

		# Allow Gradle to use up to 1 GB of RAM
		org.gradle.jvmargs=-Xmx1024M

		android.nonTransitiveRClass=false