Skip to content

Commit

Permalink
Upgrade gradle-wrapper.propertis and classpath (now com.android.tools…
Browse files Browse the repository at this point in the history
….build:gradle:2.1.2) per Android Studio 2 prompts. Remove unneeded android-support-v4.jar references.

Former-commit-id: fdd7718
Former-commit-id: 1089ecb
  • Loading branch information
rgatkinson committed Jun 25, 2016
1 parent a227754 commit d795a37
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 6 deletions.
1 change: 0 additions & 1 deletion FtcRobotController/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ repositories {
}

dependencies {
compile files('libs/android-support-v4.jar')
compile (name:'RobotCore-release', ext:'aar')
compile (name:'Hardware-release', ext:'aar')
compile (name:'FtcCommon-release', ext:'aar')
Expand Down
1 change: 0 additions & 1 deletion SwerveRoboticsLibrary/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ repositories {
}

dependencies {
compile files('libs/android-support-v4.jar')
compile(name: 'RobotCore-release', ext: 'aar')
compile(name: 'Hardware-release', ext: 'aar')
compile(name: 'FtcCommon-release', ext: 'aar')
Expand Down
1 change: 0 additions & 1 deletion build.common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ repositories {
}

dependencies {
compile files('libs/android-support-v4.jar')
compile (name:'RobotCore-release', ext:'aar')
compile (name:'Hardware-release', ext:'aar')
compile (name:'FtcCommon-release', ext:'aar')
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:2.1.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
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 @@
#Wed Apr 10 15:27:10 PDT 2013
#Fri Jun 24 17:00:05 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

0 comments on commit d795a37

Please sign in to comment.