From d795a3727dfa00b12a0dcae0aed326ddd64b44e5 Mon Sep 17 00:00:00 2001 From: Robert Atkinson Date: Fri, 24 Jun 2016 17:14:45 -0700 Subject: [PATCH] Upgrade gradle-wrapper.propertis and classpath (now com.android.tools.build:gradle:2.1.2) per Android Studio 2 prompts. Remove unneeded android-support-v4.jar references. Former-commit-id: fdd7718f5d3125999024b8ed2a7e52df137f0aa8 Former-commit-id: 1089ecba4effce55b0d54924c5554d0b739d810a --- FtcRobotController/build.gradle | 1 - SwerveRoboticsLibrary/build.gradle | 1 - build.common.gradle | 1 - build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/FtcRobotController/build.gradle b/FtcRobotController/build.gradle index 46ee3233543..c46def6c8b8 100644 --- a/FtcRobotController/build.gradle +++ b/FtcRobotController/build.gradle @@ -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') diff --git a/SwerveRoboticsLibrary/build.gradle b/SwerveRoboticsLibrary/build.gradle index d1ab44dfb96..ff706589d6d 100644 --- a/SwerveRoboticsLibrary/build.gradle +++ b/SwerveRoboticsLibrary/build.gradle @@ -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') diff --git a/build.common.gradle b/build.common.gradle index 3825a790d84..d16dbc603ef 100644 --- a/build.common.gradle +++ b/build.common.gradle @@ -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') diff --git a/build.gradle b/build.gradle index 3e1507e3b69..015f3841cf1 100644 --- a/build.gradle +++ b/build.gradle @@ -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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e760dc9..64849c39cb1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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