Skip to content
This repository has been archived by the owner on Sep 29, 2024. It is now read-only.

Commit

Permalink
Update dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
K1rakishou committed Sep 28, 2024
1 parent 582b08f commit 94edca3
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 44 deletions.
28 changes: 13 additions & 15 deletions Kuroba/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-parcelize'
apply plugin: 'com.google.devtools.ksp'
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-parcelize'
id 'com.google.devtools.ksp'
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20"
}

android {
namespace "com.github.k1rakishou.chan"
Expand Down Expand Up @@ -241,9 +244,6 @@ android {
compose = true
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = versions.compose_compiler_version
}

lintOptions {
checkReleaseBuilds false
Expand All @@ -266,18 +266,16 @@ dependencies {
implementation 'androidx.slidingpanelayout:slidingpanelayout:1.2.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation "androidx.core:core-ktx:${versions.core_ktx}"
implementation 'androidx.work:work-runtime-ktx:2.9.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
implementation 'androidx.work:work-runtime-ktx:2.9.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
implementation "com.google.android.material:material:${versions.material}"
implementation "androidx.window:window:1.2.0"

implementation "androidx.window:window:1.3.0"
implementation("androidx.compose.ui:ui:${versions.compose_version}")
implementation("androidx.compose.material:material:${versions.compose_version}")
implementation("androidx.compose.ui:ui-tooling:${versions.compose_version}")
implementation("androidx.compose.animation:animation-graphics:${versions.compose_version}")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
implementation("androidx.activity:activity-compose:1.9.0")

implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6")
implementation("androidx.activity:activity-compose:1.9.2")
implementation "com.google.android.exoplayer:exoplayer-core:${versions.exoplayer}"
implementation "com.google.android.exoplayer:exoplayer-ui:${versions.exoplayer}"
implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
Expand All @@ -292,7 +290,7 @@ dependencies {
implementation "io.reactivex.rxjava2:rxandroid:${versions.rxandroid}"
implementation "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin_version}"
implementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin_version}"
implementation 'org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5'
implementation 'org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7'
implementation "joda-time:joda-time:${versions.joda_time}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlin_coroutines_version}"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.kotlin_coroutines_version}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ abstract class ControllerHostActivity :
}
}

@Deprecated("Deprecated in Java")
override fun onBackPressed() {
if (stack.peek().onBack()) {
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ internal fun ToolbarTitleWithSubtitle(
val marqueeModifier = if (scrollableTitle) {
Modifier.basicMarquee(
iterations = Int.MAX_VALUE,
delayMillis = 3_000
repeatDelayMillis = 3_000
)
} else {
Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class SegmentedCircleDrawable : Drawable() {
paint.alpha = alpha
}

@Deprecated("Deprecated in Java")
override fun getOpacity(): Int {
return PixelFormat.TRANSLUCENT
}
Expand Down
8 changes: 4 additions & 4 deletions Kuroba/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
apply from: 'versions.gradle'
ext {
agp_version = '8.2.2'
}

repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin_version}"
classpath "com.android.tools.build:gradle:$agp_version"
classpath "com.android.tools.build:gradle:8.2.2"
classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:${versions.ksp_version}"
classpath "org.jetbrains.compose:compose-gradle-plugin:1.7.0-beta02"
}
}

Expand All @@ -22,5 +21,6 @@ allprojects {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
maven { url "https://plugins.gradle.org/m2/" }
}
}
6 changes: 0 additions & 6 deletions Kuroba/core-logger/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ android {
kotlinOptions {
jvmTarget = '17'
}
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = versions.compose_compiler_version
}
}

dependencies {
Expand Down
16 changes: 8 additions & 8 deletions Kuroba/core-themes/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-parcelize'
apply plugin: 'com.google.devtools.ksp'
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'kotlin-parcelize'
id 'com.google.devtools.ksp'
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20"
}

android {
namespace "com.github.k1rakishou.chan"
Expand Down Expand Up @@ -29,16 +32,13 @@ android {

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
freeCompilerArgs = ["-Xopt-in=kotlin.RequiresOptIn"]
freeCompilerArgs = ["-opt-in=kotlin.RequiresOptIn"]
jvmTarget = "17"
}

buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = versions.compose_compiler_version
}
}

dependencies {
Expand Down
2 changes: 0 additions & 2 deletions Kuroba/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ org.gradle.parallel=true
org.gradle.daemon=true
org.gradle.caching=true
org.gradle.workers.max=16
kotlin.experimental.tryK2=false
kapt.use.k2=false
android.nonTransitiveRClass=true
15 changes: 7 additions & 8 deletions Kuroba/versions.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
def versions = [:]
versions.kotlin_version = '1.9.24'
versions.ksp_version = '1.9.24-1.0.20'
versions.kotlin_coroutines_version = '1.8.1'
versions.compose_version = "1.7.0-beta01"
versions.compose_compiler_version = "1.5.14"
versions.kotlin_version = '2.0.20'
versions.ksp_version = '2.0.20-1.0.25'
versions.kotlin_coroutines_version = '1.9.0'
versions.compose_version = "1.7.2"
versions.room_version = '2.6.1'
versions.dagger_version = '2.51.1'
versions.dagger_version = '2.52'
versions.okhttp = "4.12.0"
versions.exoplayer = "2.19.1"
versions.coil = "2.6.0"
versions.coil = "2.7.0"
versions.voyager = "1.0.0"
versions.joda_time = "2.12.7"
versions.appcompat = "1.6.1"
versions.appcompat = "1.7.0"
versions.androidx_preferences_ktx = "1.2.1"
versions.core_ktx = '1.12.0'
versions.material = '1.12.0'
Expand Down

0 comments on commit 94edca3

Please sign in to comment.