From 88f8043df3b1a76cf3d602d148fcacfbd816cca7 Mon Sep 17 00:00:00 2001 From: Ian Field Date: Sun, 13 Oct 2019 22:42:35 +0100 Subject: [PATCH] Update to address Google Play targetSdk issue --- .github/workflows/android.yml | 22 +++++++++++ .travis.yml | 39 ------------------- app/build.gradle | 20 +++++----- .../co/ianfield/devstat/ClipboardActivity.kt | 1 - build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 6 files changed, 36 insertions(+), 54 deletions(-) create mode 100644 .github/workflows/android.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 0000000..868399b --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,22 @@ +name: Android CI + +on: + pull_request: + branches: + - master + - develop + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v1 + - name: set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Clean + run: ./gradlew clean assembleDebug diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 734f5a8..0000000 --- a/.travis.yml +++ /dev/null @@ -1,39 +0,0 @@ -language: android - -jdk: - oraclejdk8 - -env: - global: - - ANDROID_SDK_VERSION="r28.0.3" - - BUILD_TOOLS="28.0.3" - - TARGET_API="28" - -android: - components: - - tools - - build-tools-${BUILD_TOOLS} - - android-${TARGET_API} - - extra-google-m2repository - - extra-android-m2repository - - extra-android-support - # - addon-google_apis-google-${TARGET_API} - # - sys-img-x86-android-24 - -before_install: - # environment info - - uname -a - - # for gradle output style - - export TERM=dumb - -script: - - "./gradlew assembleDebug" - -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ diff --git a/app/build.gradle b/app/build.gradle index 144ac6a..d56ba02 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt' android { compileSdkVersion 29 - buildToolsVersion '29.0.1' + buildToolsVersion '29.0.2' compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -17,8 +17,8 @@ android { minSdkVersion 14 targetSdkVersion 29 applicationId 'uk.co.ianfield.devstat' - versionCode 21 - versionName '2.4.4' + versionCode 22 + versionName '2.4.5' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } signingConfigs { @@ -46,21 +46,21 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.core:core:1.0.2' - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.core:core:1.1.0' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation 'com.google.android.material:material:1.0.0' - implementation 'androidx.core:core-ktx:1.0.2' + implementation 'androidx.core:core-ktx:1.1.0' compileOnly 'javax.annotation:jsr250-api:1.0' - implementation 'com.google.dagger:dagger:2.12' - kapt 'com.google.dagger:dagger-compiler:2.12' + implementation 'com.google.dagger:dagger:2.24' + kapt 'com.google.dagger:dagger-compiler:2.24' testImplementation 'junit:junit:4.12' - testImplementation 'org.mockito:mockito-core:2.6.2' + testImplementation 'org.mockito:mockito-core:3.0.0' testImplementation 'org.hamcrest:hamcrest-library:1.3' - testImplementation 'com.google.truth:truth:0.41' + testImplementation 'com.google.truth:truth:1.0' androidTestImplementation 'junit:junit:4.12' diff --git a/app/src/main/java/uk/co/ianfield/devstat/ClipboardActivity.kt b/app/src/main/java/uk/co/ianfield/devstat/ClipboardActivity.kt index ecb3b23..70d6e59 100644 --- a/app/src/main/java/uk/co/ianfield/devstat/ClipboardActivity.kt +++ b/app/src/main/java/uk/co/ianfield/devstat/ClipboardActivity.kt @@ -22,7 +22,6 @@ class ClipboardActivity : AppCompatActivity() { public override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val statHelper = StatHelper(this) var clipboardContents = "" var list: ArrayList diff --git a/build.gradle b/build.gradle index d9f4a98..d8bde11 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.30' + ext.kotlin_version = '1.3.50' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 19410be..48a1852 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Apr 23 22:45:33 BST 2019 +#Sun Oct 13 22:28:40 BST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip