From d16a9f66dca8f460773beb8c7565e9a68de5d7ca Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Mon, 28 Sep 2015 13:08:25 -0500 Subject: [PATCH 1/3] #2434 - Wrapping make clean --- android/java/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/java/build.gradle b/android/java/build.gradle index b1f4c8d08..a1d4c3de2 100644 --- a/android/java/build.gradle +++ b/android/java/build.gradle @@ -2,3 +2,8 @@ task wrapper(type: Wrapper) { gradleVersion = '2.5' } + +task makeClean(type: Exec) { + workingDir '../../' + commandLine 'make', 'clean' +} From 85e3b267c80556f1af59db932f290f788c352d52 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Mon, 28 Sep 2015 13:23:58 -0500 Subject: [PATCH 2/3] #2434 - Adding makeAndroid and makeAndroidAll --- android/java/build.gradle | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/android/java/build.gradle b/android/java/build.gradle index a1d4c3de2..44eacc442 100644 --- a/android/java/build.gradle +++ b/android/java/build.gradle @@ -7,3 +7,13 @@ task makeClean(type: Exec) { workingDir '../../' commandLine 'make', 'clean' } + +task makeAndroid(type: Exec) { + workingDir '../../' + commandLine 'make', 'android' +} + +task makeAndroidAll(type: Exec) { + workingDir '../../' + commandLine 'make', 'apackage' +} From 7de3062602221547931813f189f5b5ab567c0afe Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Mon, 28 Sep 2015 14:15:47 -0500 Subject: [PATCH 3/3] #2434 - Centralizing buildscript dependencies and source repository. Using jcenter() instead of mavenCentral() as it's a super set --- android/java/MapboxGLAndroidSDK/build.gradle | 10 --------- .../MapboxGLAndroidSDKTestApp/build.gradle | 15 +++---------- android/java/build.gradle | 21 +++++++++++++++++++ 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle index 00ea98820..436229146 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 a98febe19..d348a9b43 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.+' } } +repositories { + maven { url 'https://maven.fabric.io/public' } +} apply plugin: 'android-sdk-manager' apply plugin: 'com.android.application' apply plugin: 'io.fabric' - -repositories { - maven { url 'https://maven.fabric.io/public' } -} - 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 44eacc442..4093fc84b 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' }