summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBilal Alsharifi <bilal-alsharifi@users.noreply.github.com>2018-04-11 13:30:58 -0400
committerJoey Grover <joeygrover@gmail.com>2018-04-11 13:30:58 -0400
commit4bc9649b311958520bd71ac555d373dc7d9676ea (patch)
tree3753b7291e932ececc7ac8f33a222d018b1792ad
parent77e11d329f48591b9959ef784f1e5a109f51fedb (diff)
downloadsdl_android-4bc9649b311958520bd71ac555d373dc7d9676ea.tar.gz
update gradle and travis (#732) Fixes #726
* Update gradle * update gradle plugin version * Update gradle version * Remove Jacoco-everywhere * Update .travis.yml
-rw-r--r--.travis.yml8
-rw-r--r--build.gradle8
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
-rw-r--r--sdl_android/build.gradle15
4 files changed, 18 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index c05f8ac6a..f138933a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ android:
- ndk-bundle
# The BuildTools version used by your project
- - build-tools-25.0.3
+ - build-tools-27.0.3
# The SDK version used to compile your project
- android-26
@@ -43,10 +43,10 @@ before_script:
script:
- android list target
- - ./gradlew connectedAndroidTest
+ - ./gradlew connectedCheck
before_install:
- - pip install --user codecov #Install codecov
+ - echo yes | sdkmanager "build-tools;27.0.3"
after_success:
- - codecov #Run codecov
+ - bash <(curl -s https://codecov.io/bash)
diff --git a/build.gradle b/build.gradle
index 1ea4bd055..11910be3e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
+
repositories {
+ google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.0'
+ classpath 'com.android.tools.build:gradle:3.1.0'
+
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -14,10 +17,11 @@ buildscript {
allprojects {
repositories {
+ google()
jcenter()
}
}
task clean(type: Delete) {
delete rootProject.buildDir
-}
+} \ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 00e84878c..9fe523a5c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 22 15:16:37 EDT 2017
+#Sun Apr 8 12:14:33 EDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/sdl_android/build.gradle b/sdl_android/build.gradle
index 7868be847..7904206a9 100644
--- a/sdl_android/build.gradle
+++ b/sdl_android/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 26
- buildToolsVersion "25.0.3"
defaultConfig {
minSdkVersion 8
targetSdkVersion 19
@@ -34,15 +33,15 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
- compile ('com.smartdevicelink:bson_java_port:1.0.0@aar'){
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation ('com.smartdevicelink:bson_java_port:1.0.0@aar'){
transitive = true
}
- androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- testCompile 'junit:junit:4.12'
- testCompile 'org.mockito:mockito-core:2.9.0'
+ testImplementation 'junit:junit:4.12'
+ testImplementation 'org.mockito:mockito-core:2.9.0'
}
@@ -54,9 +53,7 @@ buildscript {
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
- classpath 'com.trickyandroid:jacoco-everywhere:0.2.1'
}
}
-apply from: 'bintray.gradle'
-apply plugin: 'jacoco-everywhere' \ No newline at end of file
+apply from: 'bintray.gradle' \ No newline at end of file