Skip to content

Commit

Permalink
Update to ftc_app 4.0, remove maven-gradle plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
iamwood committed Oct 10, 2018
1 parent 5f251ae commit d2bef80
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
6 changes: 3 additions & 3 deletions TeamCode/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"

//FTC libraries
implementation "com.github.modular-ftc:robotcontroller-repackaged:$ftc_version.4-lite"
implementation "com.github.modular-ftc:robotcore-repackaged:$ftc_version.5-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"

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.5.3"
implementation "com.github.Pattonville-Robotics:Common-Code:3992c9f"

implementation 'org.apache.commons:commons-math3:3.6.1'
}
Expand Down
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
buildscript {
ext.kotlin_version = '1.1.51'
ext.ftc_version = '3.5'
ext.kotlin_version = '1.2.61'
ext.ftc_version = '4.0'

repositories {
google()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 comments on commit d2bef80

Please sign in to comment.