SCDS/FTCRoadRunnerRobotics
7
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	FtcRobotController/src/main/AndroidManifest.xml
#	README.md
#	build.dependencies.gradle
This commit is contained in:
Zach Harel
2024-12-23 11:43:03 -05:00
parent 06431bb98f ee16f8e657
commit 917c794ef6
7 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FtcRobotController/build.gradle
View File

@ -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

4
FtcRobotController/src/main/AndroidManifest.xml
View File

@ -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" />

6
build.common.gradle
View File

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

18
build.dependencies.gradle
View File

@ -6,16 +6,16 @@ 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'
implementation 'com.acmerobotics.dashboard:dashboard:0.4.5'
implementation 'com.acmerobotics.dashboard:dashboard:0.4.16'
}

2
build.gradle
View File

@ -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'
}
}

2
gradle.properties
View File

@ -8,3 +8,5 @@ android.enableJetifier=false
# Allow Gradle to use up to 1 GB of RAM
org.gradle.jvmargs=-Xmx1024M
android.nonTransitiveRClass=false

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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