Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 5.2 #10

Merged
merged 2 commits into from
Sep 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 109 additions & 25 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions TeamCode/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ android {
targetSdkVersion 19
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

versionCode 3
versionCode 4
versionName "$ftc_version"
}

Expand Down Expand Up @@ -62,12 +62,12 @@ dependencies {
//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:ftc-common-repackaged:$ftc_version.0-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:3992c9f"
implementation "com.github.Pattonville-Robotics:Common-Code:3.6.3"
}

6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
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()
jcenter()
}

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"
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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