Gradle 4.10 >> Gradle 5.2

TravisCI
- replaced from manual Gradle download to install with 'sdkman'
- changed build name

Gradle
- updated build tool version
This commit is contained in:
Park Dong-Ha 2019-02-10 09:35:05 +00:00 committed by Victor Zverovich
parent f041f128f5
commit 4a9d676362
2 changed files with 23 additions and 19 deletions

View File

@ -83,8 +83,8 @@ matrix:
- g++-4.4 - g++-4.4
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
# Android - name: Android NDK (Gradle)
- language: android language: android
addons: addons:
apt: apt:
update: true update: true
@ -92,23 +92,24 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- ninja-build - ninja-build
- wget - curl
- unzip
- tree - tree
android: android:
components: components:
- tools - tools
- platform-tools - platform-tools
- android-21 - android-25 # 7.0
env: - android-27 # 8.1
- ANDROID=true - android-28 # 9.0
- build-tools-28.0.3
before_install: before_install:
# Download/Install Gradle # Install Gradle from https://sdkman.io/
- wget https://services.gradle.org/distributions/gradle-4.10.2-bin.zip - curl -s "https://get.sdkman.io" | bash > /dev/null
- mkdir -p gradle - source "$HOME/.sdkman/bin/sdkman-init.sh"
- unzip -q -d ./gradle gradle-4.10.2-bin.zip - sdk version
- export GRADLE=gradle/gradle-4.10.2/bin/gradle - sdk install gradle
- bash $GRADLE --version - sdk use gradle
- gradle --version
install: install:
# Accept SDK Licenses + Install NDK # Accept SDK Licenses + Install NDK
- yes | sdkmanager --update > /dev/null 2>&1 - yes | sdkmanager --update > /dev/null 2>&1
@ -116,7 +117,8 @@ matrix:
before_script: before_script:
- pushd ./support - pushd ./support
script: script:
- bash ../$GRADLE clean assemble - gradle clean
- gradle assemble
after_success: after_success:
- popd; - popd;
- tree ./libs - tree ./libs

View File

@ -9,10 +9,12 @@ buildscript {
// //
// https://developer.android.com/studio/releases/gradle-plugin // https://developer.android.com/studio/releases/gradle-plugin
// //
// Notice that 3.1.3 here is the version of [Android Gradle Plugin] // Notice that 3.3.0 here is the version of [Android Gradle Plugin]
// Accroding to URL above you will need Gradle 4.4 or higher // 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 { repositories {
@ -43,8 +45,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 // Android 5.0+ minSdkVersion 21 // Android 5.0+
targetSdkVersion 25 // Follow Compile SDK targetSdkVersion 25 // Follow Compile SDK
versionCode 20 // Follow release count versionCode 21 // Follow release count
versionName "5.2.1" // Follow Official version versionName "5.3.0" // Follow Official version
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild { externalNativeBuild {