diff --git a/TeamCode/build.gradle b/TeamCode/build.gradle index c6a0b5c..6f2bbc3 100644 --- a/TeamCode/build.gradle +++ b/TeamCode/build.gradle @@ -12,8 +12,25 @@ // Custom definitions may go here // Include common definitions from above. + +buildscript { + repositories { + mavenCentral() + maven { + url "https://repo.dairy.foundation/releases" + } + } + dependencies { + classpath "dev.frozenmilk:Load:0.2.4" + } +} + + apply from: '../build.common.gradle' apply from: '../build.dependencies.gradle' +// there should be 2 or 3 more lines that start with 'apply plugin:' here +apply plugin: 'dev.frozenmilk.sinister.sloth.load' + android { namespace = 'org.firstinspires.ftc.teamcode' @@ -28,14 +45,32 @@ repositories { maven { url = 'https://maven.brott.dev/' } + // Dairy releases repository + maven { + url = "https://repo.dairy.foundation/releases" + } + // Dairy snapshots repository + maven { + url = "https://repo.dairy.foundation/snapshots" + } } dependencies { implementation project(':FtcRobotController') - implementation "com.acmerobotics.roadrunner:ftc:0.1.25" - implementation "com.acmerobotics.roadrunner:core:1.0.1" - implementation "com.acmerobotics.roadrunner:actions:1.0.1" - implementation "com.acmerobotics.dashboard:dashboard:0.5.1" + implementation("dev.frozenmilk.sinister:Sloth:0.2.4") implementation 'org.ftclib.ftclib:core:2.1.1' // core + implementation("com.acmerobotics.roadrunner:ftc:0.1.25") { + exclude group: "com.acmerobotics.dashboard" + } + implementation("com.acmerobotics.roadrunner:actions:1.0.1") { + exclude group: "com.acmerobotics.dashboard" + } + implementation("com.acmerobotics.roadrunner:core:1.0.1") { + exclude group: "com.acmerobotics.dashboard" + } + + implementation("com.acmerobotics.slothboard:dashboard:0.2.4+0.5.1") //Slothdashboard + } + diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java index ffcbf0a..ce946c4 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java @@ -34,6 +34,7 @@ import java.util.List; @TeleOp public class TeleopV3 extends LinearOpMode { public static double manualVel = 3000; + //Testing a new comment public static double hoodDefaultPos = 0.5; public static double spinPow = 0.09; diff --git a/build.dependencies.gradle b/build.dependencies.gradle index 28189d8..f980551 100644 --- a/build.dependencies.gradle +++ b/build.dependencies.gradle @@ -6,6 +6,7 @@ repositories { maven { url = 'https://maven.brott.dev/' } //RR maven { url = "https://maven.rowanmcalpin.com/" } //Next FTC maven { url = "https://repo.dairy.foundation/releases" } //AS + } dependencies { @@ -20,16 +21,10 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.2.0' - - implementation 'com.pedropathing:ftc:2.0.1' //PedroCore - implementation 'com.pedropathing:telemetry:0.0.6' //PedroTele - + implementation 'com.pedropathing:ftc:2.0.6' //PedroCore + implementation 'com.pedropathing:telemetry:1.0.0' //PedroTele implementation 'com.bylazar:fullpanels:1.0.2' //Panels - implementation "com.acmerobotics.roadrunner:ftc:0.1.25" //RR - implementation "com.acmerobotics.roadrunner:core:1.0.1" //RR - implementation "com.acmerobotics.roadrunner:actions:1.0.1" //RR - implementation "com.acmerobotics.dashboard:dashboard:0.5.1" //FTC Dash implementation 'org.ftclib.ftclib:core:2.1.1' // FTC LIB @@ -40,11 +35,5 @@ dependencies { implementation("page.j5155.AdvantageScope:lite:v26.0.0") //AS - - - - - - }