diff --git a/.gitignore b/.gitignore index 5b0a37c..007f5f7 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ lint/outputs/ lint/tmp/ # lint/reports/ 1.json +/.settings/org.eclipse.buildship.core.prefs diff --git a/app/build.gradle b/app/build.gradle index 52617cc..25b8a31 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,9 +14,9 @@ android { defaultConfig { applicationId "de.raphaelebner.roomdatabasebackup.sample" minSdkVersion 21 - targetSdkVersion 33 - compileSdk 33 - buildToolsVersion = "33.0.1" + targetSdkVersion 34 + compileSdk 34 + buildToolsVersion = "34.0.0" versionCode 1 versionName "1.0.3" @@ -47,7 +47,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation project(path: ':core') @@ -57,7 +57,7 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' //ROOM SQLite - def room_version = "2.5.2" + def room_version = "2.6.1" implementation "androidx.room:room-runtime:$room_version" ksp "androidx.room:room-compiler:$room_version" @@ -69,7 +69,7 @@ dependencies { implementation "androidx.room:room-rxjava2:$room_version" implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" // optional - Guava support for Room, including Optional and ListenableFuture implementation "androidx.room:room-guava:$room_version" @@ -78,9 +78,9 @@ dependencies { testImplementation "androidx.room:room-testing:$room_version" //Recyclerview Implementation - implementation 'androidx.recyclerview:recyclerview:1.3.1' + implementation 'androidx.recyclerview:recyclerview:1.3.2' //Material Design Implementation - implementation 'com.google.android.material:material:1.9.0' + implementation 'com.google.android.material:material:1.11.0' } diff --git a/build.gradle b/build.gradle index a3365cc..eaf4ce1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.8.0' + ext.kotlin_version = '1.9.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -16,9 +16,9 @@ buildscript { plugins { id('io.github.gradle-nexus.publish-plugin') version "1.3.0" - id("org.jetbrains.dokka") version "1.8.20" - id 'org.jetbrains.kotlin.android' version '1.8.0' apply false - id("com.google.devtools.ksp") version "1.8.10-1.0.9" apply false + id("org.jetbrains.dokka") version "1.9.10" + id 'org.jetbrains.kotlin.android' version '1.9.10' apply false + id("com.google.devtools.ksp") version "1.9.10-1.0.13" apply false } apply from: "${rootDir}/scripts/publish-root.gradle" @@ -30,6 +30,6 @@ allprojects { } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle index 7870350..9c837fe 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -14,9 +14,9 @@ android { defaultConfig { minSdkVersion 21 - targetSdkVersion 33 - compileSdk 33 - buildToolsVersion = "33.0.1" + targetSdkVersion 34 + compileSdk 34 + buildToolsVersion = "34.0.0" versionCode 1 versionName '1.0.0-beta13' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -59,14 +59,14 @@ apply from: "${rootProject.projectDir}/scripts/publish-module.gradle" dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.core:core-ktx:1.10.1' + implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.appcompat:appcompat:1.6.1' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' //ROOM SQLite - def room_version = "2.5.2" + def room_version = "2.6.1" implementation "androidx.room:room-runtime:$room_version" ksp "androidx.room:room-compiler:$room_version" @@ -84,7 +84,7 @@ dependencies { testImplementation "androidx.room:room-testing:$room_version" //Material Design Implementation - implementation 'com.google.android.material:material:1.9.0' + implementation 'com.google.android.material:material:1.11.0' //Androidx Security implementation "androidx.security:security-crypto:1.1.0-alpha06" @@ -95,6 +95,6 @@ dependencies { //Apache commons io //https://mvnrepository.com/artifact/commons-io/commons-io //noinspection GradleDependency - implementation 'commons-io:commons-io:2.13.0' + implementation 'commons-io:commons-io:2.15.1' } diff --git a/gradle.properties b/gradle.properties index dd6e9ae..e4e12f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,5 @@ android.enableJetifier=false kotlin.code.style=official kapt.incremental.apt=true android.defaults.buildfeatures.buildconfig=true -android.nonTransitiveRClass=false +android.nonTransitiveRClass=true android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d88c11..eead2e3 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-8.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip diff --git a/scripts/publish-module.gradle b/scripts/publish-module.gradle index aa45796..697bcd5 100644 --- a/scripts/publish-module.gradle +++ b/scripts/publish-module.gradle @@ -2,7 +2,7 @@ apply plugin: 'maven-publish' apply plugin: 'signing' apply plugin: 'org.jetbrains.dokka' -task androidSourcesJar(type: Jar) { +tasks.register('androidSourcesJar', Jar) { archiveClassifier.set('sources') if (project.plugins.findPlugin("com.android.library")) { // For Android libraries @@ -21,12 +21,14 @@ tasks.withType(dokkaHtmlPartial.getClass()).configureEach { ) } -task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { +tasks.register('javadocJar', Jar) { + dependsOn dokkaJavadoc archiveClassifier.set("javadoc") from dokkaJavadoc.outputDirectory } -task htmldocJar(type: Jar, dependsOn: dokkaHtml) { +tasks.register('htmldocJar', Jar) { + dependsOn dokkaHtml archiveClassifier.set("htmldoc") from dokkaHtml.outputDirectory }