diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8fa5558..ec4462e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,12 +1,13 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import java.io.ByteArrayOutputStream import java.nio.charset.Charset plugins { - kotlin("kapt") alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) alias(libs.plugins.android.junit5) alias(libs.plugins.hilt.android) + alias(libs.plugins.google.devtools.ksp) } abstract class GitVersionValueSource : ValueSource { @@ -34,8 +35,8 @@ android { compileSdk = 35 minSdk = 26 targetSdk = 35 - versionCode = 115 - versionName = "5.11.0" + versionCode = 116 + versionName = "5.12.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -89,10 +90,13 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } } + buildFeatures { viewBinding = true buildConfig = true @@ -129,11 +133,6 @@ android { } -// Allow references to generated code -kapt { - correctErrorTypes = true -} - dependencies { coreLibraryDesugaring(libs.desugar.jdk.libs) @@ -160,9 +159,9 @@ dependencies { implementation(libs.hilt.work) implementation(libs.work.runtime.ktx) - kapt(libs.hilt.compiler) - kapt(libs.hilt.android.compiler) - kapt(libs.dagger.hilt.compiler) + ksp(libs.hilt.compiler) + ksp(libs.hilt.android.compiler) + ksp(libs.dagger.hilt.compiler) testImplementation(libs.junit.jupiter.api) testImplementation(libs.junit.jupiter.params) diff --git a/app/src/test/java/android/util/Log.java b/app/src/test/java/android/util/Log.java index 7946ed2..36727bb 100644 --- a/app/src/test/java/android/util/Log.java +++ b/app/src/test/java/android/util/Log.java @@ -2,6 +2,8 @@ package android.util; /** * Mock implementation for android.util.Log + * + * @noinspection unused */ public class Log { public static int d(String tag, String msg) { @@ -24,4 +26,21 @@ public class Log { return 0; } + public static boolean isLoggable(String tag, int level) { + return true; + } + + public static int println(int priority, String tag, String msg) { + return switch (priority) { + case 2 -> // DEBUG + d(tag, msg); + case 3 -> // INFO + i(tag, msg); + case 4 -> // WARN + w(tag, msg); + case 5 -> // ERROR + e(tag, msg); + default -> 0; // Unknown priority + }; + } } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 96df123..9b983b7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,4 +5,5 @@ plugins { alias(libs.plugins.android.junit5) apply false alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.hilt.android) apply false + alias(libs.plugins.google.devtools.ksp) apply false } \ No newline at end of file diff --git a/fastlane/metadata/android/de/changelogs/116.txt b/fastlane/metadata/android/de/changelogs/116.txt new file mode 100644 index 0000000..5f1d77f --- /dev/null +++ b/fastlane/metadata/android/de/changelogs/116.txt @@ -0,0 +1,2 @@ +- Übersetzungen aktualisiert +- Abhängigkeiten aktualisiert \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/116.txt b/fastlane/metadata/android/en-US/changelogs/116.txt new file mode 100644 index 0000000..12e6475 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/116.txt @@ -0,0 +1,2 @@ +- Updated translations +- Updated dependencies \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 919e8f7..87f98a8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,32 +1,33 @@ [versions] activity = "1.10.1" -androidGradlePlugin = "8.10.1" -androidJunit5 = "1.12.0.0" -androidTest = "1.7.0" -appcompat = "1.7.0" -awaitility = "4.2.2" +androidGradlePlugin = "8.11.1" +androidJunit5 = "1.13.1.0" +androidTest = "1.8.0" +appcompat = "1.7.1" +awaitility = "4.3.0" assertjCore = "3.27.3" constraintlayout = "2.2.1" desugar_jdk_libs = "2.1.5" espressoCore = "3.6.1" -hilt = "2.56.1" +hilt = "2.57" hiltAndroid = "1.2.0" -gson = "2.12.1" -jackson = "2.18.4" +gson = "2.13.1" +jackson = "2.19.2" junit = "1.2.1" -junitJupiterApi = "5.12.2" -kotlin = "2.1.10" +junitJupiterApi = "5.13.4" +kotlin = "2.2.0" +ksp = "2.2.0-2.0.2" localbroadcastmanager = "1.1.0" -lifecycleViewmodelKtx = "2.9.0" -loggingInterceptor = "4.12.0" +lifecycleViewmodelKtx = "2.9.2" +loggingInterceptor = "5.1.0" material = "1.12.0" mockitoCore = "5.18.0" recyclerview = "1.4.0" preferenceKtx = "1.2.1" -retrofit = "2.11.0" +retrofit = "3.0.0" runner = "1.6.2" swiperefreshlayout = "1.1.0" -workRuntimeKtx = "2.10.1" +workRuntimeKtx = "2.10.2" [libraries] activity = { module = "androidx.activity:activity", version.ref = "activity" } @@ -72,3 +73,4 @@ android-junit5 = { id = "de.mannodermaus.android-junit5", version.ref = "android android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" } hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } \ No newline at end of file