prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update kotlin to 2.1

Browse Source
This commit is contained in:
Koitharu
2025-02-11 14:23:18 +02:00
parent 5f0514638a
commit 19e8e3a618
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/gradle.xml generated
View File

@@ -6,14 +6,13 @@
<GradleProjectSettings> <GradleProjectSettings>
<option name="testRunner" value="CHOOSE_PER_TEST" /> <option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" /> <option name="gradleJvm" value="jbr-21" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
</set> </set>
</option> </option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>

5
app/build.gradle
View File

@@ -7,6 +7,7 @@ plugins {
id 'com.google.devtools.ksp' id 'com.google.devtools.ksp'
id 'kotlin-parcelize' id 'kotlin-parcelize'
id 'dagger.hilt.android.plugin' id 'dagger.hilt.android.plugin'
id 'androidx.room'
} }
android { android {
@@ -24,7 +25,6 @@ android {
testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner' testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
ksp { ksp {
arg('room.generateKotlin', 'true') arg('room.generateKotlin', 'true')
arg('room.schemaLocation', "$projectDir/schemas")
} }
androidResources { androidResources {
generateLocaleConfig true generateLocaleConfig true
@@ -77,6 +77,9 @@ android {
'-opt-in=coil3.annotation.InternalCoilApi', '-opt-in=coil3.annotation.InternalCoilApi',
] ]
} }
room {
schemaDirectory "$projectDir/schemas"
}
lint { lint {
abortOnError true abortOnError true
disable 'MissingTranslation', 'PrivateResource', 'SetJavaScriptEnabled', 'SimpleDateFormat' disable 'MissingTranslation', 'PrivateResource', 'SetJavaScriptEnabled', 'SimpleDateFormat'

1
app/src/main/kotlin/org/koitharu/kotatsu/list/ui/model/ListHeader.kt
View File

@@ -4,7 +4,6 @@ import android.content.Context
import androidx.annotation.StringRes import androidx.annotation.StringRes
import org.koitharu.kotatsu.core.ui.model.DateTimeAgo import org.koitharu.kotatsu.core.ui.model.DateTimeAgo
@ExposedCopyVisibility
data class ListHeader private constructor( data class ListHeader private constructor(
private val textRaw: Any, private val textRaw: Any,
@StringRes val buttonTextRes: Int, @StringRes val buttonTextRes: Int,

1
build.gradle
View File

@@ -3,4 +3,5 @@ plugins {
alias(libs.plugins.kotlin) apply false alias(libs.plugins.kotlin) apply false
alias(libs.plugins.hilt) apply false alias(libs.plugins.hilt) apply false
alias(libs.plugins.ksp) apply false alias(libs.plugins.ksp) apply false
alias(libs.plugins.room) apply false
} }

2
gradle.properties
View File

@@ -18,4 +18,4 @@ kotlin.code.style=official
org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M" org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
android.enableR8.fullMode=true android.enableR8.fullMode=true
android.nonFinalResIds=false android.nonFinalResIds=false
kapt.use.k2=true kapt.use.k2=false

7
gradle/libs.versions.toml
View File

@@ -5,7 +5,7 @@ adapterdelegates = "4.3.2"
appcompat = "1.7.0" appcompat = "1.7.0"
avifDecoder = "1.1.1.14d8e3c4" avifDecoder = "1.1.1.14d8e3c4"
biometric = "1.2.0-alpha05" biometric = "1.2.0-alpha05"
coil = "3.0.4" coil = "3.1.0"
collections = "1.4.5" collections = "1.4.5"
#noinspection GradleDependency - 2.5.3 cause crashes #noinspection GradleDependency - 2.5.3 cause crashes
conscrypt = "2.5.2" conscrypt = "2.5.2"
@@ -22,8 +22,8 @@ hilt = "1.2.0"
json = "20250107" json = "20250107"
junit = "4.13.2" junit = "4.13.2"
junitKtx = "1.2.1" junitKtx = "1.2.1"
kotlin = "2.0.21" kotlin = "2.1.10"
ksp = "2.0.21-1.0.28" ksp = "2.1.10-1.0.29"
leakcanary = "3.0-alpha-8" leakcanary = "3.0-alpha-8"
lifecycle = "2.8.7" lifecycle = "2.8.7"
markwon = "4.6.2" markwon = "4.6.2"
@@ -113,3 +113,4 @@ android-application = { id = "com.android.application", version.ref = "gradle" }
kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
room = { id = "androidx.room", version.ref = "room" }