Skip to content

Commit

Permalink
Update to address Google Play targetSdk issue
Browse files Browse the repository at this point in the history
  • Loading branch information
IanField90 committed Oct 13, 2019
1 parent f82f900 commit 88f8043
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 54 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -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
39 changes: 0 additions & 39 deletions .travis.yml

This file was deleted.

20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down Expand Up @@ -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'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<StatItem>
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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"
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 88f8043

Please sign in to comment.