Skip to content

Commit 9facc8a

Browse files
committed
Use forked pedro to fix null issues, automatically use local cmdx when available over jitpack
mavenlocal preference over jitpack means we can do stuff without having to connect to internet
1 parent b560eac commit 9facc8a

2 files changed

Lines changed: 20 additions & 13 deletions

File tree

TeamCode/build.gradle

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@ android {
2121
dependencies {
2222
implementation project(':FtcRobotController')
2323

24-
implementation 'com.github.AshOnDiscord.FTC-OffSeason:cmdx:9045b2b7c3'
25-
implementation 'com.github.AshOnDiscord.FTC-OffSeason:cmdxpedro:9045b2b7c3'
26-
27-
// maven local
28-
// implementation('com.millburnx:cmdx:+')
29-
// implementation('com.millburnx:cmdxpedro:+')
24+
if (new File("${System.getProperty('user.home')}/.m2/repository/com/millburnx/cmdx").exists()) {
25+
println "📦 [deps] Using mavenLocal cmdx"
26+
implementation('com.millburnx:cmdx:+')
27+
implementation('com.millburnx:cmdxpedro:+')
28+
} else {
29+
println "📦 [deps] Using JitPack cmdx (9045b2b7c3)"
30+
implementation 'com.github.AshOnDiscord.FTC-OffSeason:cmdx:9045b2b7c3'
31+
implementation 'com.github.AshOnDiscord.FTC-OffSeason:cmdxpedro:9045b2b7c3'
32+
}
3033

3134
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
3235
implementation 'org.ftclib.ftclib:core:2.1.1'

build.dependencies.gradle

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
repositories {
2+
mavenLocal()
23
mavenCentral()
34
google() // Needed for androidx
5+
maven { url = "https://central.sonatype.com/repository/maven-snapshots/" }
46
maven { url = "https://mymaven.bylazar.com/releases" }
57
maven { url = 'https://maven.brott.dev/' }
6-
maven { url = "https://central.sonatype.com/repository/maven-snapshots/" }
78
}
89

910
dependencies {
@@ -18,15 +19,18 @@ dependencies {
1819
implementation 'androidx.appcompat:appcompat:1.2.0'
1920

2021
// implementation 'com.pedropathing:ftc:2.0.6'
21-
implementation 'com.pedropathing:ftc:2.1.0-SNAPSHOT'
22+
// implementation 'com.pedropathing:ftc:2.1.0-SNAPSHOT'
23+
implementation('com.pedropathing:ftc:2.1.1') {
24+
changing = true
25+
}
2226
implementation 'com.pedropathing:telemetry:1.0.0'
2327
implementation 'com.bylazar:fullpanels:1.0.12'
2428

2529
implementation 'com.acmerobotics.dashboard:dashboard:0.5.1'
2630
}
2731

28-
configurations.configureEach {
29-
resolutionStrategy {
30-
cacheChangingModulesFor(365, "days")
31-
}
32-
}
32+
//configurations.configureEach {
33+
// resolutionStrategy {
34+
// cacheChangingModulesFor(365, "days")
35+
// }
36+
//}

0 commit comments

Comments
 (0)