Skip to content

Commit a22d8a5

Browse files
authored
Merge pull request #10 from modular-ftc/update-to-5.2
Update to 5.2
2 parents 2add13e + 0d67a4e commit a22d8a5

File tree

5 files changed

+124
-33
lines changed

5 files changed

+124
-33
lines changed

.idea/codeStyles/Project.xml

+109-25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

TeamCode/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
targetSdkVersion 19
2222
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2323

24-
versionCode 3
24+
versionCode 4
2525
versionName "$ftc_version"
2626
}
2727

@@ -62,12 +62,12 @@ dependencies {
6262
//Repackaged FTC libraries
6363
implementation "com.github.modular-ftc:robotcontroller-repackaged:$ftc_version.1-lite"
6464
implementation "com.github.modular-ftc:robotcore-repackaged:$ftc_version.1-lite"
65-
implementation "com.github.modular-ftc:ftc-common-repackaged:$ftc_version.0-lite"
65+
implementation "com.github.modular-ftc:ftc-common-repackaged:$ftc_version.1-lite"
6666

6767
//Original FTC libraries
6868
implementation "org.first.ftc:hardware:$ftc_version"
6969

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

build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.11'
3-
ext.ftc_version = '4.3'
2+
ext.kotlin_version = '1.3.41'
3+
ext.ftc_version = '5.2'
44

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Oct 07 14:51:45 CDT 2018
1+
#Thu Sep 26 16:31:31 CDT 2019
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-5.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 commit comments

Comments
 (0)