Skip to content
This repository was archived by the owner on Aug 26, 2025. It is now read-only.

Commit 0bb284f

Browse files
committed
Merge SDK 11.0
2 parents 65cc485 + 40bc118 commit 0bb284f

File tree

112 files changed

+6583
-2548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+6583
-2548
lines changed

.github/CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ If what you've read so far makes little sense, there are some very good git lear
1818
[Git Book](https://git-scm.com/book/en/v2)
1919
[Interactive Git Tutorial](https://try.github.io)
2020

21-
##### Guidlines for experienced GIT users.
21+
### Guidlines for experienced GIT users.
2222

2323
If you are absolutely certain that you want to push the big green button above, read on. Otherwise back _slowly away from keyboard_.
2424

@@ -38,9 +38,9 @@ This section guides you through filing a bug report. The better the report the
3838

3939
#### Before submitting a bug report
4040

41-
- Check the [forums](http://ftcforum.usfirst.org/forum.php) to see if someone else has run into the problem and whether there is an official solution that doesn't require a new SDK.
41+
- Check the [forums](http://ftcforum.firstinspires.org/forum.php) to see if someone else has run into the problem and whether there is an official solution that doesn't require a new SDK.
4242

43-
- Perform a search of current [issues](https://github.com/ftctechnh/ftc_app/issues) to see if the problem has already been reported. If so, add a comment to the existing issue instead of creating a new one.
43+
- Perform a search of current [issues](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues) to see if the problem has already been reported. If so, add a comment to the existing issue instead of creating a new one.
4444

4545
#### How Do I Submit A (Good) Bug Report?
4646

@@ -65,4 +65,4 @@ FIRST volunteers are awesome. You all have great ideas and we want to hear them
6565

6666
Enhancements should be broadly applicable to a large majority of teams, should not force teams to change their workflow, and should provide real value to the mission of FIRST as it relates to engaging youth in engineering activities.
6767

68-
The best way to get momentum behind new features is to post a description of your idea in the forums. Build community support for it. The FTC Technology Team monitors the forums. We'll hear you and if there's a large enough call for the feature it's very likely to get put on the list for a future release.
68+
The best way to get momentum behind new features is to post a description of your idea in the discussions section of this repository. Build community support for it. The FTC Technology Team monitors the discussions. We'll hear you and if there's a large enough call for the feature it's very likely to get put on the list for a future release.

.gitignore

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
# Files for the ART/Dalvik VM
1010
*.dex
1111

12-
# Java class files
12+
# Java/JDK files
1313
*.class
14+
*.hprof
1415

1516
# Generated files
1617
bin/
@@ -41,17 +42,9 @@ captures/
4142
# IntelliJ
4243
*.iml
4344
.idea/
44-
.idea/workspace.xml
45-
.idea/tasks.xml
46-
.idea/gradle.xml
47-
.idea/assetWizardSettings.xml
48-
.idea/dictionaries
49-
.idea/libraries
50-
# Android Studio 3 in .gitignore file.
51-
.idea/caches
52-
.idea/modules.xml
53-
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
54-
.idea/navEditor.xml
45+
46+
# For Mac users
47+
.DS_Store
5548

5649
# Keystore files
5750
# Uncomment the following lines if you do not want to check your keystore files in.
@@ -85,4 +78,4 @@ lint/intermediates/
8578
lint/generated/
8679
lint/outputs/
8780
lint/tmp/
88-
# lint/reports/
81+
# lint/reports/

FtcRobotController/build.gradle

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,21 @@ apply plugin: 'com.android.library'
88
android {
99

1010
defaultConfig {
11-
minSdkVersion 23
11+
minSdkVersion 24
1212
//noinspection ExpiredTargetSdkVersion
1313
targetSdkVersion 28
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 {
20-
sourceCompatibility JavaVersion.VERSION_1_7
21-
targetCompatibility JavaVersion.VERSION_1_7
24+
sourceCompatibility JavaVersion.VERSION_1_8
25+
targetCompatibility JavaVersion.VERSION_1_8
2226
}
2327
namespace = 'com.qualcomm.ftcrobotcontroller'
2428
}

FtcRobotController/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
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="47"
5-
android:versionName="8.0">
4+
android:versionCode="60"
5+
android:versionName="11.0">
66

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

-667 KB
Binary file not shown.

FtcRobotController/src/main/assets/FTC_2016-17.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.
-78.4 KB
Binary file not shown.

FtcRobotController/src/main/assets/RelicVuMark.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.
-400 KB
Binary file not shown.

FtcRobotController/src/main/assets/StonesAndChips.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)