diff --git a/.travis.yml b/.travis.yml index 0725265e..b437efd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,8 +83,8 @@ matrix: - g++-4.4 sources: - ubuntu-toolchain-r-test - # Android - - language: android + - name: Android NDK (Gradle) + language: android addons: apt: update: true @@ -92,23 +92,24 @@ matrix: - ubuntu-toolchain-r-test packages: - ninja-build - - wget - - unzip + - curl - tree android: components: - tools - platform-tools - - android-21 - env: - - ANDROID=true + - android-25 # 7.0 + - android-27 # 8.1 + - android-28 # 9.0 + - build-tools-28.0.3 before_install: - # Download/Install Gradle - - wget https://services.gradle.org/distributions/gradle-4.10.2-bin.zip - - mkdir -p gradle - - unzip -q -d ./gradle gradle-4.10.2-bin.zip - - export GRADLE=gradle/gradle-4.10.2/bin/gradle - - bash $GRADLE --version + # Install Gradle from https://sdkman.io/ + - curl -s "https://get.sdkman.io" | bash > /dev/null + - source "$HOME/.sdkman/bin/sdkman-init.sh" + - sdk version + - sdk install gradle + - sdk use gradle + - gradle --version install: # Accept SDK Licenses + Install NDK - yes | sdkmanager --update > /dev/null 2>&1 @@ -116,7 +117,8 @@ matrix: before_script: - pushd ./support script: - - bash ../$GRADLE clean assemble + - gradle clean + - gradle assemble after_success: - popd; - tree ./libs diff --git a/support/build.gradle b/support/build.gradle index 797cf491..11648da8 100644 --- a/support/build.gradle +++ b/support/build.gradle @@ -9,10 +9,12 @@ buildscript { // // https://developer.android.com/studio/releases/gradle-plugin // - // Notice that 3.1.3 here is the version of [Android Gradle Plugin] - // Accroding to URL above you will need Gradle 4.4 or higher + // Notice that 3.3.0 here is the version of [Android Gradle Plugin] + // Accroding to URL above you will need Gradle 5.0 or higher // - classpath 'com.android.tools.build:gradle:3.1.3' + // If you are using Android Studio, and it is using Gradle's lower + // version, Use the plugin version 3.1.3 ~ 3.2.0 for Gradle 4.4 ~ 4.10 + classpath 'com.android.tools.build:gradle:3.3.0' } } repositories { @@ -43,8 +45,8 @@ android { defaultConfig { minSdkVersion 21 // Android 5.0+ targetSdkVersion 25 // Follow Compile SDK - versionCode 20 // Follow release count - versionName "5.2.1" // Follow Official version + versionCode 21 // Follow release count + versionName "5.3.0" // Follow Official version testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild {