Skip to content

Commit 5c2f614

Browse files
authored
Merge pull request #4 from modular-ftc/update-to-4.0
Update to 4.0
2 parents 6485bf2 + 9a18841 commit 5c2f614

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android:
66
components:
77
- tools
88
- platform-tools
9-
- build-tools-27.0.3
9+
- build-tools-28.0.2
1010
- android-27
1111
- extra-google-m2repository
1212

TeamCode/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ dependencies {
6666
implementation "org.first.ftc:hardware:$ftc_version"
6767

6868
//The Pattonville Robotics shared libraries are included by default. Remove the following line to stop using them.
69-
implementation "com.github.Pattonville-Robotics:Common-Code:ce72e05"
69+
implementation "com.github.Pattonville-Robotics:Common-Code:3992c9f"
7070
}
7171

TeamCode/proguard-rules.pro

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@
1414
-dontwarn com.google.gson.**
1515
-dontwarn com.google.errorprone.**
1616
-dontwarn com.qualcomm.analytics.**
17-
-dontwarn org.apache.commons.math3.geometry.euclidean.twod.Line
17+
-dontwarn com.qualcomm.wirelessp2p.**
18+
-dontwarn com.osterhoutgroup.**
19+
-dontwarn org.apache.commons.math3.geometry.euclidean.twod.Line
20+
-dontwarn org.checkerframework.**
21+
-dontwarn afu.org.checkerframework.**

build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
buildscript {
2-
ext.kotlin_version = '1.2.60'
3-
ext.ftc_version = '3.7'
2+
ext.kotlin_version = '1.2.61'
3+
ext.ftc_version = '4.0'
44

55
repositories {
66
google()
77
jcenter()
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.1.4'
11+
classpath 'com.android.tools.build:gradle:3.2.0'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
}
1414

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#Thu Jun 01 08:33:11 PDT 2017
1+
#Sun Oct 07 14:51:45 CDT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
7-
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 commit comments

Comments
 (0)