Skip to content

Commit 2b577c6

Browse files
committed
CHG gradle version to 8.1.0 and java-17
1 parent 6519476 commit 2b577c6

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

.github/workflows/android.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v2
12-
- name: set up JDK 1.11
11+
- uses: actions/checkout@v2
12+
- name: set up JDK 1.17
1313
uses: actions/setup-java@v1
1414
with:
15-
java-version: 1.11
15+
java-version: 1.17
1616

1717
- name: Cache Gradle packages
1818
uses: actions/cache@v2

app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@ plugins {
55
}
66

77
android {
8-
compileSdkVersion 33
9-
buildToolsVersion "30.0.3"
108

119
compileOptions {
12-
sourceCompatibility JavaVersion.VERSION_1_8
13-
targetCompatibility JavaVersion.VERSION_1_8
10+
sourceCompatibility JavaVersion.VERSION_17
11+
targetCompatibility JavaVersion.VERSION_17
1412
}
1513

1614
defaultConfig {
1715
applicationId "de.raphaelebner.roomdatabasebackup.sample"
1816
minSdkVersion 21
1917
targetSdkVersion 33
18+
compileSdk 33
19+
buildToolsVersion = "33.0.1"
2020
versionCode 1
2121
versionName "1.0.3"
2222

2323
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2424
javaCompileOptions {
2525
annotationProcessorOptions {
2626
arguments += [
27-
"room.schemaLocation":"$projectDir/schemas".toString(),
28-
"room.incremental":"true",
29-
"room.expandProjection":"true"]
27+
"room.schemaLocation" : "$projectDir/schemas".toString(),
28+
"room.incremental" : "true",
29+
"room.expandProjection": "true"]
3030
}
3131
}
3232
}
@@ -43,7 +43,7 @@ android {
4343
}
4444

4545
kotlinOptions {
46-
jvmTarget = JavaVersion.VERSION_1_8.toString()
46+
jvmTarget = JavaVersion.VERSION_17.toString()
4747
}
4848
namespace 'de.raphaelebner.roomdatabasebackup.sample'
4949
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.4.2'
9+
classpath 'com.android.tools.build:gradle:8.1.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111

1212
// NOTE: Do not place your application dependencies here; they belong

core/build.gradle

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,18 @@ plugins {
77
}
88

99
android {
10-
compileSdkVersion 33
11-
buildToolsVersion "30.0.3"
12-
1310
compileOptions {
14-
sourceCompatibility JavaVersion.VERSION_1_8
15-
targetCompatibility JavaVersion.VERSION_1_8
11+
sourceCompatibility JavaVersion.VERSION_17
12+
targetCompatibility JavaVersion.VERSION_17
1613
}
1714

1815
defaultConfig {
1916
minSdkVersion 21
2017
targetSdkVersion 33
18+
compileSdk 33
19+
buildToolsVersion = "33.0.1"
2120
versionCode 1
2221
versionName '1.0.0-beta12'
23-
2422
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2523
consumerProguardFiles "consumer-rules.pro"
2624
}
@@ -45,7 +43,7 @@ android {
4543
}
4644

4745
kotlinOptions {
48-
jvmTarget = JavaVersion.VERSION_1_8.toString()
46+
jvmTarget = JavaVersion.VERSION_17.toString()
4947
}
5048
namespace 'de.raphaelebner.roomdatabasebackup.core'
5149

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ android.enableJetifier=false
2020
# Kotlin code style for this project: "official" or "obsolete":
2121
kotlin.code.style=official
2222
kapt.incremental.apt=true
23+
android.defaults.buildfeatures.buildconfig=true
24+
android.nonTransitiveRClass=false
25+
android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

0 commit comments

Comments
 (0)