Skip to content

Commit ee16f8e

Browse files
authored
Merge pull request #1250 from FIRST-Tech-Challenge/20241102-092223-release-candidate
FtcRobotController v10.1.1
2 parents 6af9bb6 + 9f11128 commit ee16f8e

8 files changed

+40
-19
lines changed

FtcRobotController/build.gradle

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ android {
1414
buildConfigField "String", "APP_BUILD_TIME", '"' + (new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.ROOT).format(new Date())) + '"'
1515
}
1616

17-
compileSdkVersion 29
17+
buildFeatures {
18+
buildConfig = true
19+
}
20+
21+
compileSdkVersion 30
1822

1923
compileOptions {
2024
sourceCompatibility JavaVersion.VERSION_1_8

FtcRobotController/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
android:versionCode="56"
5-
android:versionName="10.1">
4+
android:versionCode="57"
5+
android:versionName="10.1.1">
66

77
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
88

README.md

+20-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This repository contains the public FTC SDK for the INTO THE DEEP (2024-2025) co
66
This GitHub repository contains the source code that is used to build an Android app to control a *FIRST* Tech Challenge competition robot. To use this SDK, download/clone the entire project to your local computer.
77

88
## Requirements
9-
To use this Android Studio project, you will need Android Studio 2021.2 (codename Chipmunk) or later.
9+
To use this Android Studio project, you will need Android Studio Ladybug (2024.2) or later.
1010

1111
To program your robot in Blocks or OnBot Java, you do not need Android Studio.
1212

@@ -59,6 +59,25 @@ The readme.md file located in the [/TeamCode/src/main/java/org/firstinspires/ftc
5959

6060
# Release Information
6161

62+
## Version 10.1.1 (20241102-092223)
63+
64+
### Breaking Changes
65+
66+
* Support for Android Studio Ladybug. Requires Android Studio Ladybug.
67+
68+
### Known Issues
69+
70+
* Android Studio Ladybug's bundled JDK is version 21. JDK 21 has deprecated support for Java 1.8, and Ladybug will warn on this deprecation.
71+
OnBotJava only supports Java 1.8, therefore, in order to ensure that software developed using Android Studio will
72+
run within the OnBotJava environment, the targetCompatibility and sourceCompatibility versions for the SDK have been left at VERSION_1_8.
73+
FIRST has decided that until it can devote the resources to migrating OnBotJava to a newer version of Java, the deprecation is the
74+
lesser of two non-optimal situations.
75+
76+
### Enhancements
77+
78+
* Added `toString()` method to Pose2D
79+
* Added `toString()` method to SparkFunOTOS.Pose2D
80+
6281
## Version 10.1 (20240919-122750)
6382

6483
### Enhancements

build.common.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apply plugin: 'com.android.application'
2121

2222
android {
2323

24-
compileSdkVersion 29
24+
compileSdkVersion 30
2525

2626
signingConfigs {
2727
release {
@@ -109,10 +109,6 @@ android {
109109
packagingOptions {
110110
pickFirst '**/*.so'
111111
}
112-
sourceSets.main {
113-
jni.srcDirs = []
114-
jniLibs.srcDir rootProject.file('libs')
115-
}
116112
ndkVersion '21.3.6528147'
117113
}
118114

build.dependencies.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ repositories {
44
}
55

66
dependencies {
7-
implementation 'org.firstinspires.ftc:Inspection:10.1.0'
8-
implementation 'org.firstinspires.ftc:Blocks:10.1.0'
9-
implementation 'org.firstinspires.ftc:RobotCore:10.1.0'
10-
implementation 'org.firstinspires.ftc:RobotServer:10.1.0'
11-
implementation 'org.firstinspires.ftc:OnBotJava:10.1.0'
12-
implementation 'org.firstinspires.ftc:Hardware:10.1.0'
13-
implementation 'org.firstinspires.ftc:FtcCommon:10.1.0'
14-
implementation 'org.firstinspires.ftc:Vision:10.1.0'
7+
implementation 'org.firstinspires.ftc:Inspection:10.1.1'
8+
implementation 'org.firstinspires.ftc:Blocks:10.1.1'
9+
implementation 'org.firstinspires.ftc:RobotCore:10.1.1'
10+
implementation 'org.firstinspires.ftc:RobotServer:10.1.1'
11+
implementation 'org.firstinspires.ftc:OnBotJava:10.1.1'
12+
implementation 'org.firstinspires.ftc:Hardware:10.1.1'
13+
implementation 'org.firstinspires.ftc:FtcCommon:10.1.1'
14+
implementation 'org.firstinspires.ftc:Vision:10.1.1'
1515
implementation 'androidx.appcompat:appcompat:1.2.0'
1616
}
1717

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
}
1212
dependencies {
1313
// Note for FTC Teams: Do not modify this yourself.
14-
classpath 'com.android.tools.build:gradle:7.2.0'
14+
classpath 'com.android.tools.build:gradle:8.7.0'
1515
}
1616
}
1717

gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ android.enableJetifier=false
88

99
# Allow Gradle to use up to 1 GB of RAM
1010
org.gradle.jvmargs=-Xmx1024M
11+
12+
android.nonTransitiveRClass=false
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)