diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..f4c7417f9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +dist: bionic +sudo: required +matrix: + include: + - env: TARGET_OS= +before_install: +- "$TRAVIS_BUILD_DIR/travis/$TRAVIS_OS_NAME.$TARGET_OS.before_install" +install: +- "$TRAVIS_BUILD_DIR/travis/$TRAVIS_OS_NAME.$TARGET_OS.install" +script: +- "$TRAVIS_BUILD_DIR/travis/$TRAVIS_OS_NAME.$TARGET_OS.script" diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java index eb55c9a9d..a8739f0b0 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java @@ -305,7 +305,8 @@ public final class MainActivity t = Toast.makeText(this, msg, duration); lastToast = new WeakReference(t); } else { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && t.getView().isShown()) { +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && t.getView().isShown()) { + if (Build.VERSION.SDK_INT >= 28 && t.getView().isShown()) { t.cancel(); } t.setText(msg); diff --git a/travis/linux..before_install b/travis/linux..before_install new file mode 100755 index 000000000..89ee51523 --- /dev/null +++ b/travis/linux..before_install @@ -0,0 +1,2 @@ +#!/bin/sh +sudo apt-get update -qq diff --git a/travis/linux..install b/travis/linux..install new file mode 100755 index 000000000..8ce7cdef9 --- /dev/null +++ b/travis/linux..install @@ -0,0 +1,9 @@ +#!/bin/sh +sudo apt-get install -y \ + android-sdk \ + android-sdk-platform-23 \ + apksigner \ + default-jdk-headless \ + gettext \ + gradle \ + libgradle-android-plugin-java diff --git a/travis/linux..script b/travis/linux..script new file mode 100755 index 000000000..9ace520a3 --- /dev/null +++ b/travis/linux..script @@ -0,0 +1,30 @@ +#!/bin/sh +set -e + +cd AndorsTrail + +ln -s ../travis/support/build.gradle ../travis/support/gradle.properties \ + ../travis/support/local.properties . + +mkdir -p src/main/assets/translation src/main/java +ln -s ../../AndroidManifest.xml ../../res src/main +ln -s ../../com src/main/java + +for po in assets/translation/*.po +do + msgfmt -o src/main/${po%.po}.mo $po +done + +gradle assembleRelease + +keytool -genkeypair -v -keystore keystore.p12 -storepass changeit \ + -keypass changeit -storetype pkcs12 -alias self -keyalg RSA \ + -validity 10000 -dname \ + "CN=Unknown, OU=Unknown, O=Unknown, L=Unknown, ST=Unknown, C=Unknown" + +VERSION=$(grep android:versionCode AndroidManifest.xml | cut -d \" -f 2) +APK=com.gpl.rpg.AndorsTrail_$VERSION.apk + +apksigner sign --out $APK -v --ks keystore.p12 --ks-pass pass:changeit \ + build/outputs/apk/AndorsTrail-release-unsigned.apk +apksigner verify $APK diff --git a/travis/support/build.gradle b/travis/support/build.gradle new file mode 100644 index 000000000..3a2394f34 --- /dev/null +++ b/travis/support/build.gradle @@ -0,0 +1,20 @@ +buildscript { + repositories { + maven { url "file:///usr/share/maven-repo" } + } + + dependencies { + classpath "com.android.tools.build:gradle:debian" + } +} + +apply plugin: "com.android.application" + +android { + compileSdkVersion 23 + buildToolsVersion "24.0.0" +} + +dependencies { + compile files("libs/android-support-v4.jar") +} diff --git a/travis/support/gradle.properties b/travis/support/gradle.properties new file mode 100644 index 000000000..96218a335 --- /dev/null +++ b/travis/support/gradle.properties @@ -0,0 +1 @@ +android.disableResourceValidation=true diff --git a/travis/support/local.properties b/travis/support/local.properties new file mode 100644 index 000000000..f54a1b042 --- /dev/null +++ b/travis/support/local.properties @@ -0,0 +1 @@ +sdk.dir=/usr/lib/android-sdk