Update API version to Android P Preview (#239)

* Upgraded to Android P

* Fix Travis CI (Try 1)

* Fix Travis CI (Try 2)

* Fix Travis CI (Try 3)

* Fix Travis CI (Try 4)

* Fix Travis CI (Try 5)

* Fix Travis CI (Try 6)

* Fix Travis CI (Try 7)

* Fix Travis CI (Try 8)

* Revert Fix Travis CI (Try 8)

* Minor change

* Add parsing of the lint report in Travis CI

* Refactor Gradle config

* Add TODO comments
This commit is contained in:
Juan Miguel Boyero Corral 2018-05-16 22:12:42 +02:00 committed by GitHub
parent 222e9a1c15
commit 3381e18458
2 changed files with 61 additions and 40 deletions

View File

@ -1,19 +1,39 @@
sudo: false
language: android
jdk:
- oraclejdk8
android:
components:
- tools
- tools
- platform-tools
- build-tools-27.0.3
- android-27
- extra-android-m2repository
- extra-android-support
- extra-google-m2repository
- extra-google-google_play_services
script:
- "./gradlew build connectedCheck"
jdk: oraclejdk8
env:
global:
- ANDROID_API=P
- ANDROID_BUILD_TOOLS=28.0.0-rc2 #TODO Switch to release version when Android P is released
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -rf $HOME/.gradle/caches/*/plugin-resolution/
cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.android/build-cache
before_install:
- chmod +x gradlew
- yes | sdkmanager "platforms;android-27"
# Travis still uses 'android' command behind the 'components' section update.
# That command is obsolete and cannot update Android SDK Tools after 25.2.5.
# Let's solve it here with the new command 'sdkmanager'
- yes | sdkmanager --verbose "build-tools;${ANDROID_BUILD_TOOLS}"
- yes | sdkmanager --verbose "platform-tools"
- yes | sdkmanager --verbose "tools"
- yes | sdkmanager --verbose "platforms;android-${ANDROID_API}"
- yes | sdkmanager --verbose "extras;android;m2repository"
# Check tools and dependencies installed
- yes | sdkmanager --list
- chmod +x gradlew
script :
- ./gradlew build connectedCheck
after_failure: "cat $TRAVIS_BUILD_DIR/SWADroid/build/reports/lint-results.xml"

View File

@ -1,16 +1,31 @@
apply plugin: 'com.android.application'
import org.ajoberstar.grgit.Grgit
ext {
git = org.ajoberstar.grgit.Grgit.open()
git = Grgit.open()
gitVersionCode = git.tag.list().size()
gitVersionName = "${git.describe()}"
}
travisBuild = System.getenv("TRAVIS") == "true"
//return a BuildConfigField from a properties file.
def static getBuildConfigField(String property){
def travisBuild = System.getenv("TRAVIS") == "true"
def value
if(travisBuild) {
value = "\"" + System.getenv(property) + "\""
} else {
Properties properties = new Properties()
properties.load(new FileInputStream("keystore.properties"))
value = "\"" + properties.getProperty(property) + "\""
}
return value
}
android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
compileSdkVersion "android-P"
dexOptions {
maxProcessCount=2
@ -27,7 +42,7 @@ android {
versionName gitVersionName
minSdkVersion 14
targetSdkVersion 27
targetSdkVersion "P"
android.applicationVariants.all { variant ->
def appName
@ -59,25 +74,11 @@ android {
}
}
//return a BuildConfigField from a properties file.
def getBuildConfigField(String property){
def value
if(travisBuild) {
value = "\"" + System.getenv(property) + "\""
} else {
Properties properties = new Properties()
properties.load(new FileInputStream("keystore.properties"))
value = "\"" + properties.getProperty(property) + "\""
}
return value
}
//TODO Switch to release versions when Android P is released
dependencies {
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.google.android.gms:play-services-analytics:15.0.0'
implementation 'com.android.support:support-v4:28.0.0-alpha1'
implementation 'com.android.support:appcompat-v7:28.0.0-alpha1'
implementation 'com.google.android.gms:play-services-analytics:15.0.2'
implementation 'com.google.code.ksoap2-android:ksoap2-android:3.6.2'
implementation 'commons-io:commons-io:2.6'
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'