Use repo dependencies for sample builds
Using repository dependencies rather than file dependencies
for sample builds.
Specifically, the support library is pulled in directly now, so libs/
folders are no longer required.
Also removed superfluous defaultConfig{} and used
mavenCentral() for adding the Maven Central repository.
Change-Id: I4ce74031bdb171587086c17456d6cfc1ac635269
Conflicts:
input/gestures/BasicGestureDetect/settings.gradle
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/build.gradle b/connectivity/BasicSyncAdapter/BasicSyncAdapter/build.gradle
index 2cb4273..555c6dc 100644
--- a/connectivity/BasicSyncAdapter/BasicSyncAdapter/build.gradle
+++ b/connectivity/BasicSyncAdapter/BasicSyncAdapter/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- maven { url 'http://repo1.maven.org/maven2' }
+ mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
@@ -14,15 +14,10 @@
dependencies {
compile 'com.google.guava:guava:14.0.+'
- compile files('libs/android-support-v4.jar')
+ compile "com.android.support:support-v4:18.0.+"
}
android {
compileSdkVersion 17
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 7
- targetSdkVersion 17
- }
}
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/libs/android-support-v4.jar b/connectivity/BasicSyncAdapter/BasicSyncAdapter/libs/android-support-v4.jar
deleted file mode 100644
index 4846ef9..0000000
--- a/connectivity/BasicSyncAdapter/BasicSyncAdapter/libs/android-support-v4.jar
+++ /dev/null
Binary files differ
diff --git a/content/contacts/BasicContactables/BasicContactables/build.gradle b/content/contacts/BasicContactables/BasicContactables/build.gradle
index d4023a9..3e3e430 100644
--- a/content/contacts/BasicContactables/BasicContactables/build.gradle
+++ b/content/contacts/BasicContactables/BasicContactables/build.gradle
@@ -3,21 +3,16 @@
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.4'
+ classpath 'com.android.tools.build:gradle:0.5.+'
}
}
apply plugin: 'android'
dependencies {
- compile files('libs/android-support-v4.jar')
+ compile "com.android.support:support-v4:18.0.+"
}
android {
compileSdkVersion 18
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 18
- targetSdkVersion 18
- }
}
diff --git a/content/contacts/BasicContactables/BasicContactables/libs/android-support-v4.jar b/content/contacts/BasicContactables/BasicContactables/libs/android-support-v4.jar
deleted file mode 100644
index 428bdbc..0000000
--- a/content/contacts/BasicContactables/BasicContactables/libs/android-support-v4.jar
+++ /dev/null
Binary files differ
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetect/build.gradle b/input/gestures/BasicGestureDetect/BasicGestureDetect/build.gradle
index 15c24fc..e3b2dce 100644
--- a/input/gestures/BasicGestureDetect/BasicGestureDetect/build.gradle
+++ b/input/gestures/BasicGestureDetect/BasicGestureDetect/build.gradle
@@ -8,20 +8,11 @@
}
apply plugin: 'android'
-repositories {
- mavenCentral()
-}
-
dependencies {
- compile 'com.android.support:support-v4:13.0.+'
+ compile "com.android.support:support-v4:18.0.+"
}
android {
- compileSdkVersion 18
+ compileSdkVersion 17
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 7
- targetSdkVersion 16
- }
}
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouch/build.gradle b/input/multitouch/BasicMultitouch/BasicMultitouch/build.gradle
index bcc634b..f2eea5d 100644
--- a/input/multitouch/BasicMultitouch/BasicMultitouch/build.gradle
+++ b/input/multitouch/BasicMultitouch/BasicMultitouch/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- maven { url 'http://repo1.maven.org/maven2' }
+ mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
@@ -11,9 +11,4 @@
android {
compileSdkVersion 17
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 8
- targetSdkVersion 17
- }
}
diff --git a/media/BasicMediaRouter/BasicMediaRouter/build.gradle b/media/BasicMediaRouter/BasicMediaRouter/build.gradle
index 87dbf18..f2eea5d 100644
--- a/media/BasicMediaRouter/BasicMediaRouter/build.gradle
+++ b/media/BasicMediaRouter/BasicMediaRouter/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- maven { url 'http://repo1.maven.org/maven2' }
+ mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
@@ -11,9 +11,4 @@
android {
compileSdkVersion 17
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 17
- targetSdkVersion 17
- }
}
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStore/build.gradle b/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStore/build.gradle
index d4023a9..3e3e430 100644
--- a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStore/build.gradle
+++ b/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStore/build.gradle
@@ -3,21 +3,16 @@
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.4'
+ classpath 'com.android.tools.build:gradle:0.5.+'
}
}
apply plugin: 'android'
dependencies {
- compile files('libs/android-support-v4.jar')
+ compile "com.android.support:support-v4:18.0.+"
}
android {
compileSdkVersion 18
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 18
- targetSdkVersion 18
- }
}
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStore/libs/android-support-v4.jar b/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStore/libs/android-support-v4.jar
deleted file mode 100644
index 428bdbc..0000000
--- a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStore/libs/android-support-v4.jar
+++ /dev/null
Binary files differ
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibility/build.gradle b/ui/accessibility/BasicAccessibility/BasicAccessibility/build.gradle
index 9eaf472..e3b2dce 100644
--- a/ui/accessibility/BasicAccessibility/BasicAccessibility/build.gradle
+++ b/ui/accessibility/BasicAccessibility/BasicAccessibility/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- maven { url 'http://repo1.maven.org/maven2' }
+ mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
@@ -9,15 +9,10 @@
apply plugin: 'android'
dependencies {
- compile files('libs/android-support-v4.jar')
+ compile "com.android.support:support-v4:18.0.+"
}
android {
compileSdkVersion 17
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 7
- targetSdkVersion 16
- }
}
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibility/libs/android-support-v4.jar b/ui/accessibility/BasicAccessibility/BasicAccessibility/libs/android-support-v4.jar
deleted file mode 100644
index 428bdbc..0000000
--- a/ui/accessibility/BasicAccessibility/BasicAccessibility/libs/android-support-v4.jar
+++ /dev/null
Binary files differ
diff --git a/ui/actionbar/DoneBar/DoneBar/build.gradle b/ui/actionbar/DoneBar/DoneBar/build.gradle
index dd97c2b..f2eea5d 100644
--- a/ui/actionbar/DoneBar/DoneBar/build.gradle
+++ b/ui/actionbar/DoneBar/DoneBar/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- maven { url 'http://repo1.maven.org/maven2' }
+ mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
@@ -11,9 +11,4 @@
android {
compileSdkVersion 17
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 14
- targetSdkVersion 17
- }
}
diff --git a/ui/holo/BorderlessButtons/BorderlessButtons/build.gradle b/ui/holo/BorderlessButtons/BorderlessButtons/build.gradle
index dd97c2b..f2eea5d 100644
--- a/ui/holo/BorderlessButtons/BorderlessButtons/build.gradle
+++ b/ui/holo/BorderlessButtons/BorderlessButtons/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- maven { url 'http://repo1.maven.org/maven2' }
+ mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
@@ -11,9 +11,4 @@
android {
compileSdkVersion 17
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 14
- targetSdkVersion 17
- }
}
diff --git a/ui/lists/CustomChoiceList/CustomChoiceList/build.gradle b/ui/lists/CustomChoiceList/CustomChoiceList/build.gradle
index 0567910..f2eea5d 100644
--- a/ui/lists/CustomChoiceList/CustomChoiceList/build.gradle
+++ b/ui/lists/CustomChoiceList/CustomChoiceList/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- maven { url 'http://repo1.maven.org/maven2' }
+ mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
@@ -11,10 +11,4 @@
android {
compileSdkVersion 17
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 3
- targetSdkVersion 17
- }
}
-
diff --git a/ui/notifications/BasicNotifications/BasicNotifications/build.gradle b/ui/notifications/BasicNotifications/BasicNotifications/build.gradle
index a5e56b5..e3b2dce 100644
--- a/ui/notifications/BasicNotifications/BasicNotifications/build.gradle
+++ b/ui/notifications/BasicNotifications/BasicNotifications/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- maven { url 'http://repo1.maven.org/maven2' }
+ mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
@@ -9,16 +9,10 @@
apply plugin: 'android'
dependencies {
- compile files('libs/android-support-v4.jar')
+ compile "com.android.support:support-v4:18.0.+"
}
android {
compileSdkVersion 17
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 8
- targetSdkVersion 17
- }
}
-
diff --git a/ui/notifications/BasicNotifications/BasicNotifications/libs/android-support-v4.jar b/ui/notifications/BasicNotifications/BasicNotifications/libs/android-support-v4.jar
deleted file mode 100644
index 428bdbc..0000000
--- a/ui/notifications/BasicNotifications/BasicNotifications/libs/android-support-v4.jar
+++ /dev/null
Binary files differ
diff --git a/ui/views/HorizontalPaging/HorizontalPaging/build.gradle b/ui/views/HorizontalPaging/HorizontalPaging/build.gradle
index 10dfcfa..e3b2dce 100644
--- a/ui/views/HorizontalPaging/HorizontalPaging/build.gradle
+++ b/ui/views/HorizontalPaging/HorizontalPaging/build.gradle
@@ -3,21 +3,16 @@
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.4'
+ classpath 'com.android.tools.build:gradle:0.5.+'
}
}
apply plugin: 'android'
dependencies {
- compile files('libs/android-support-v4.jar')
+ compile "com.android.support:support-v4:18.0.+"
}
android {
compileSdkVersion 17
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 11
- targetSdkVersion 16
- }
}
diff --git a/ui/views/HorizontalPaging/HorizontalPaging/libs/android-support-v4.jar b/ui/views/HorizontalPaging/HorizontalPaging/libs/android-support-v4.jar
deleted file mode 100644
index 428bdbc..0000000
--- a/ui/views/HorizontalPaging/HorizontalPaging/libs/android-support-v4.jar
+++ /dev/null
Binary files differ
diff --git a/ui/views/TextSwitcher/TextSwitcher/build.gradle b/ui/views/TextSwitcher/TextSwitcher/build.gradle
index 72904c9..e3b2dce 100644
--- a/ui/views/TextSwitcher/TextSwitcher/build.gradle
+++ b/ui/views/TextSwitcher/TextSwitcher/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- maven { url 'http://repo1.maven.org/maven2' }
+ mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
@@ -9,16 +9,10 @@
apply plugin: 'android'
dependencies {
- compile files('libs/android-support-v4.jar')
+ compile "com.android.support:support-v4:18.0.+"
}
android {
compileSdkVersion 17
buildToolsVersion "17.0.0"
-
- defaultConfig {
- minSdkVersion 4
- targetSdkVersion 17
- }
}
-
