diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 2a742ca..bd92e5e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -8,11 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: set up JDK 1.11 + - uses: actions/checkout@v2 + - name: set up JDK 1.17 uses: actions/setup-java@v1 with: - java-version: 1.11 + java-version: 1.17 - name: Cache Gradle packages uses: actions/cache@v2 diff --git a/app/build.gradle b/app/build.gradle index c5b835d..bf0eca4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,18 +5,18 @@ plugins { } android { - compileSdkVersion 33 - buildToolsVersion "30.0.3" compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } defaultConfig { applicationId "de.raphaelebner.roomdatabasebackup.sample" minSdkVersion 21 targetSdkVersion 33 + compileSdk 33 + buildToolsVersion = "33.0.1" versionCode 1 versionName "1.0.3" @@ -24,9 +24,9 @@ android { javaCompileOptions { annotationProcessorOptions { arguments += [ - "room.schemaLocation":"$projectDir/schemas".toString(), - "room.incremental":"true", - "room.expandProjection":"true"] + "room.schemaLocation" : "$projectDir/schemas".toString(), + "room.incremental" : "true", + "room.expandProjection": "true"] } } } @@ -43,7 +43,7 @@ android { } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } namespace 'de.raphaelebner.roomdatabasebackup.sample' } diff --git a/build.gradle b/build.gradle index 7992c99..cab33ae 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/core/build.gradle b/core/build.gradle index becd1c4..f7d4661 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -7,20 +7,18 @@ plugins { } android { - compileSdkVersion 33 - buildToolsVersion "30.0.3" - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } defaultConfig { minSdkVersion 21 targetSdkVersion 33 + compileSdk 33 + buildToolsVersion = "33.0.1" versionCode 1 versionName '1.0.0-beta12' - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } @@ -45,7 +43,7 @@ android { } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } namespace 'de.raphaelebner.roomdatabasebackup.core' diff --git a/gradle.properties b/gradle.properties index cccf324..dd6e9ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,3 +20,6 @@ android.enableJetifier=false # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official kapt.incremental.apt=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b68f8a4..4d88c11 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip