Merge remote-tracking branch 'upstream/master'

# 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
7 changed files with 21 additions and 19 deletions

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