summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-09-28 14:15:47 -0500
committerBrad Leege <bleege@gmail.com>2015-09-28 14:15:47 -0500
commit7de3062602221547931813f189f5b5ab567c0afe (patch)
tree74848c60872faa1f5747af0d0d1e5456382c2ab7 /android
parent85e3b267c80556f1af59db932f290f788c352d52 (diff)
downloadqtlocation-mapboxgl-7de3062602221547931813f189f5b5ab567c0afe.tar.gz
#2434 - Centralizing buildscript dependencies and source repository. Using jcenter() instead of mavenCentral() as it's a super set
Diffstat (limited to 'android')
-rw-r--r--android/java/MapboxGLAndroidSDK/build.gradle10
-rw-r--r--android/java/MapboxGLAndroidSDKTestApp/build.gradle15
-rw-r--r--android/java/build.gradle21
3 files changed, 24 insertions, 22 deletions
diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle
index 00ea988205..4362291468 100644
--- a/android/java/MapboxGLAndroidSDK/build.gradle
+++ b/android/java/MapboxGLAndroidSDK/build.gradle
@@ -1,13 +1,3 @@
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:1.3.0'
- classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
- }
-}
-
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.library'
apply plugin: 'checkstyle'
diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
index a98febe194..d348a9b437 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
@@ -1,23 +1,18 @@
buildscript {
repositories {
- mavenCentral()
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.3.0'
- classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
classpath 'io.fabric.tools:gradle:1.+'
}
}
-
-apply plugin: 'android-sdk-manager'
-apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
-
repositories {
maven { url 'https://maven.fabric.io/public' }
}
+apply plugin: 'android-sdk-manager'
+apply plugin: 'com.android.application'
+apply plugin: 'io.fabric'
apply plugin: 'checkstyle'
task accessToken {
@@ -41,10 +36,6 @@ android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
- repositories {
- mavenCentral()
- }
-
defaultConfig {
applicationId "com.mapbox.mapboxgl.testapp"
minSdkVersion 15
diff --git a/android/java/build.gradle b/android/java/build.gradle
index 44eacc4422..4093fc84b2 100644
--- a/android/java/build.gradle
+++ b/android/java/build.gradle
@@ -1,4 +1,25 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.3.0'
+ classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
task wrapper(type: Wrapper) {
gradleVersion = '2.5'
}