Skip to content

Commit 1b36329

Browse files
committed
update libs
1 parent 213dec2 commit 1b36329

6 files changed

Lines changed: 34 additions & 26 deletions

File tree

.github/workflows/cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@v2
1515
- uses: actions/setup-java@v1
1616
with:
17-
java-version: '11'
17+
java-version: '17'
1818
- name: Cache gradle
1919
uses: actions/cache@v1
2020
with:

.github/workflows/ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ name: CI - build, tests, lint
22

33
on:
44
push:
5-
branches-ignore:
6-
- master
5+
branches:
6+
- '**'
7+
tags-ignore:
8+
- '**'
79
pull_request:
810
branches: [ master ]
911

@@ -16,7 +18,7 @@ jobs:
1618
uses: actions/checkout@v2
1719
- uses: actions/setup-java@v1
1820
with:
19-
java-version: '11'
21+
java-version: '17'
2022
- name: Cache gradle
2123
uses: actions/cache@v1
2224
with:
@@ -42,12 +44,12 @@ jobs:
4244
strategy:
4345
fail-fast: false
4446
matrix:
45-
api-level: [16, 17, 18, 19, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31]
47+
api-level: [16, 17, 18, 19, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33]
4648
steps:
4749
- uses: actions/checkout@v1
4850
- uses: actions/setup-java@v1
4951
with:
50-
java-version: '11'
52+
java-version: '17'
5153
- name: Cache gradle
5254
uses: actions/cache@v1
5355
with:

app/build.gradle

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ android {
1414
applicationId "com.softartdev.conwaysgameoflife"
1515
minSdkVersion 16
1616
targetSdk 33
17-
versionCode 21
18-
versionName '2.1'
19-
resConfigs 'en'
17+
versionCode 211
18+
versionName '2.1.1'
19+
resourceConfigurations += ['en']
2020
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2121
}
2222
buildFeatures {
@@ -50,26 +50,29 @@ android {
5050
sourceCompatibility JavaVersion.VERSION_1_8
5151
targetCompatibility JavaVersion.VERSION_1_8
5252
}
53+
kotlinOptions {
54+
jvmTarget = '1.8'
55+
}
5356
testBuildType = project.hasProperty("testBuildType") ? project.property("testBuildType") : "debug"
5457
}
5558

5659
dependencies {
5760
implementation fileTree(dir: 'libs', include: ['*.jar'])
5861
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
59-
implementation 'androidx.core:core-ktx:1.9.0'
60-
implementation 'androidx.appcompat:appcompat:1.5.1'
62+
implementation 'androidx.core:core-ktx:1.10.0'
63+
implementation 'androidx.appcompat:appcompat:1.6.1'
6164
implementation 'com.jakewharton.timber:timber:5.0.1'
62-
implementation platform('com.google.firebase:firebase-bom:30.5.0')
65+
implementation platform('com.google.firebase:firebase-bom:31.5.0')
6366
implementation 'com.google.firebase:firebase-analytics'
6467
implementation 'com.google.firebase:firebase-crashlytics'
65-
def leak_canary_version = '2.9.1'
68+
def leak_canary_version = '2.10'
6669
debugImplementation "com.squareup.leakcanary:leakcanary-android-process:$leak_canary_version"
6770
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leak_canary_version"
6871
implementation "com.squareup.leakcanary:plumber-android:$leak_canary_version"
6972
testImplementation 'junit:junit:4.13.2'
70-
androidTestImplementation 'androidx.test:core:1.5.0-beta01'
71-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
72-
androidTestImplementation 'androidx.test:rules:1.4.0'
73-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
73+
androidTestImplementation 'androidx.test:core:1.5.0'
74+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
75+
androidTestImplementation 'androidx.test:rules:1.5.0'
76+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
7477
androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leak_canary_version"
7578
}

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
buildscript {
2-
ext.kotlin_version = '1.7.20'
2+
ext.kotlin_version = '1.8.21'
33
repositories {
44
mavenCentral()
55
google()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.3.1'
8+
classpath 'com.android.tools.build:gradle:8.0.0'
99
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
10-
classpath 'com.google.gms:google-services:4.3.14'
11-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
10+
classpath 'com.google.gms:google-services:4.3.15'
11+
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
1212
}
1313
}
1414

gradle.properties

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
1212
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13-
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
13+
org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048m" -XX:+UseParallelGC
1414

1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
@@ -21,4 +21,7 @@ org.gradle.configureondemand=true
2121
org.gradle.caching=true
2222

2323
android.enableJetifier=true
24-
android.useAndroidX=true
24+
android.useAndroidX=true
25+
android.defaults.buildfeatures.buildconfig=true
26+
android.nonTransitiveRClass=false
27+
android.nonFinalResIds=false
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Sep 19 02:08:56 GET 2022
1+
#Fri Apr 28 01:34:31 GET 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)