diff --git a/.gitignore b/.gitignore index 3df05b8..5b0a37c 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ lint/generated/ lint/outputs/ lint/tmp/ # lint/reports/ +1.json diff --git a/app/build.gradle b/app/build.gradle index bf0eca4..52617cc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ plugins { id('com.android.application') id('kotlin-android') - id('kotlin-kapt') + id("com.google.devtools.ksp") } android { @@ -21,13 +21,10 @@ android { versionName "1.0.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - javaCompileOptions { - annotationProcessorOptions { - arguments += [ - "room.schemaLocation" : "$projectDir/schemas".toString(), - "room.incremental" : "true", - "room.expandProjection": "true"] - } + ksp { + arg("room.schemaLocation", "$projectDir/schemas") + arg("room.incremental", "true") + arg("room.expandProjection", "true") } } @@ -50,7 +47,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation project(path: ':core') @@ -60,10 +57,10 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' //ROOM SQLite - def room_version = "2.5.0" + def room_version = "2.5.2" implementation "androidx.room:room-runtime:$room_version" - kapt "androidx.room:room-compiler:$room_version" + ksp "androidx.room:room-compiler:$room_version" // optional - Kotlin Extensions and Coroutines support for Room implementation "androidx.room:room-ktx:$room_version" @@ -72,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.5.1" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1" // optional - Guava support for Room, including Optional and ListenableFuture implementation "androidx.room:room-guava:$room_version" @@ -81,9 +78,9 @@ dependencies { testImplementation "androidx.room:room-testing:$room_version" //Recyclerview Implementation - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.1' //Material Design Implementation - implementation 'com.google.android.material:material:1.8.0' + implementation 'com.google.android.material:material:1.9.0' } diff --git a/build.gradle b/build.gradle index cab33ae..a3365cc 100644 --- a/build.gradle +++ b/build.gradle @@ -15,9 +15,10 @@ buildscript { } plugins { - id('io.github.gradle-nexus.publish-plugin') version "1.1.0" - id("org.jetbrains.dokka") version "1.7.10" - id 'org.jetbrains.kotlin.android' version '1.7.10' apply false + 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 } apply from: "${rootDir}/scripts/publish-root.gradle" diff --git a/core/build.gradle b/core/build.gradle index f7d4661..8a9b7b3 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,7 +1,7 @@ plugins { id('com.android.library') id('kotlin-android') - id('kotlin-kapt') + id("com.google.devtools.ksp") id('maven-publish') id('org.jetbrains.dokka') } @@ -59,17 +59,17 @@ apply from: "${rootProject.projectDir}/scripts/publish-module.gradle" dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.core:core-ktx:1.9.0' + implementation 'androidx.core:core-ktx:1.10.1' 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.0" + def room_version = "2.5.2" implementation "androidx.room:room-runtime:$room_version" - kapt "androidx.room:room-compiler:$room_version" + ksp "androidx.room:room-compiler:$room_version" // optional - Kotlin Extensions and Coroutines support for Room implementation "androidx.room:room-ktx:$room_version" @@ -84,10 +84,10 @@ dependencies { testImplementation "androidx.room:room-testing:$room_version" //Material Design Implementation - implementation 'com.google.android.material:material:1.8.0' + implementation 'com.google.android.material:material:1.9.0' //Androidx Security - implementation "androidx.security:security-crypto:1.1.0-alpha05" + implementation "androidx.security:security-crypto:1.1.0-alpha06" //Google Guava implementation 'com.google.guava:guava:31.0.1-jre' @@ -95,6 +95,6 @@ dependencies { //Apache commons io //https://mvnrepository.com/artifact/commons-io/commons-io //noinspection GradleDependency - implementation 'commons-io:commons-io:2.11.0' + implementation 'commons-io:commons-io:2.13.0' } diff --git a/jitpack.yml b/jitpack.yml deleted file mode 100644 index 05e9606..0000000 --- a/jitpack.yml +++ /dev/null @@ -1,5 +0,0 @@ -jdk: - - openjdk11 -before_install: - - sdk install java 11.0.10-open - - sdk use java 11.0.10-open