From bc99bd2520bcf622697cb68e4489ecaec94a35fe Mon Sep 17 00:00:00 2001 From: William Skaggs Date: Thu, 26 Sep 2019 16:43:24 -0500 Subject: [PATCH 1/2] Update dependencies to 5.2 --- .idea/codeStyles/Project.xml | 134 ++++++++++++++++++----- .idea/kotlinc.xml | 7 ++ TeamCode/build.gradle | 8 +- build.gradle | 6 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 5 files changed, 125 insertions(+), 34 deletions(-) create mode 100644 .idea/kotlinc.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 7c294a3..1e90526 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -3,30 +3,114 @@ - - - - - - - - - - + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..5806fb3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/TeamCode/build.gradle b/TeamCode/build.gradle index 680b26f..3f586cf 100644 --- a/TeamCode/build.gradle +++ b/TeamCode/build.gradle @@ -21,7 +21,7 @@ android { targetSdkVersion 19 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - versionCode 3 + versionCode 4 versionName "$ftc_version" } @@ -60,14 +60,14 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" //Repackaged FTC libraries - implementation "com.github.modular-ftc:robotcontroller-repackaged:$ftc_version.1-lite" - implementation "com.github.modular-ftc:robotcore-repackaged:$ftc_version.1-lite" + implementation "com.github.modular-ftc:robotcontroller-repackaged:$ftc_version.0-lite" + implementation "com.github.modular-ftc:robotcore-repackaged:$ftc_version.0-lite" implementation "com.github.modular-ftc:ftc-common-repackaged:$ftc_version.0-lite" //Original FTC libraries implementation "org.first.ftc:hardware:$ftc_version" //The Pattonville Robotics shared libraries are included by default. Remove the following line to stop using them. - implementation "com.github.Pattonville-Robotics:Common-Code:3992c9f" + implementation "com.github.Pattonville-Robotics:Common-Code:3.6.2" } diff --git a/build.gradle b/build.gradle index af458e1..7d1e818 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.kotlin_version = '1.3.11' - ext.ftc_version = '4.3' + ext.kotlin_version = '1.3.41' + ext.ftc_version = '5.2' repositories { google() @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d7bbaf8..1f2ed4e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Oct 07 14:51:45 CDT 2018 +#Thu Sep 26 16:31:31 CDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From 0d67a4e303682f7b4e970d1cd5cc97fb176d7f3a Mon Sep 17 00:00:00 2001 From: William Skaggs Date: Thu, 26 Sep 2019 18:12:35 -0500 Subject: [PATCH 2/2] Update dependencies to 5.2.1 --- TeamCode/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TeamCode/build.gradle b/TeamCode/build.gradle index 3f586cf..ce472db 100644 --- a/TeamCode/build.gradle +++ b/TeamCode/build.gradle @@ -60,14 +60,14 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" //Repackaged FTC libraries - implementation "com.github.modular-ftc:robotcontroller-repackaged:$ftc_version.0-lite" - implementation "com.github.modular-ftc:robotcore-repackaged:$ftc_version.0-lite" - implementation "com.github.modular-ftc:ftc-common-repackaged:$ftc_version.0-lite" + implementation "com.github.modular-ftc:robotcontroller-repackaged:$ftc_version.1-lite" + implementation "com.github.modular-ftc:robotcore-repackaged:$ftc_version.1-lite" + implementation "com.github.modular-ftc:ftc-common-repackaged:$ftc_version.1-lite" //Original FTC libraries implementation "org.first.ftc:hardware:$ftc_version" //The Pattonville Robotics shared libraries are included by default. Remove the following line to stop using them. - implementation "com.github.Pattonville-Robotics:Common-Code:3.6.2" + implementation "com.github.Pattonville-Robotics:Common-Code:3.6.3" }