Skip to content

Commit

Permalink
Bump everything except decompose
Browse files Browse the repository at this point in the history
  • Loading branch information
HeroBrine1st committed Jun 12, 2024
1 parent f85a3ca commit 961a6f2
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 28 deletions.
47 changes: 24 additions & 23 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ plugins {
id("com.mikepenz.aboutlibraries.plugin")
kotlin("plugin.serialization")
id("androidx.room")
id("org.jetbrains.kotlin.plugin.compose")
}

val kotlinVersion = "1.9.21"
val composeCompilerVersion = "1.5.11"
val protobufVersion = "4.26.1"
val composeCompilerVersion = "1.5.14"
val protobufVersion = "4.27.0"

val ktorVersion = "2.3.9"
val ktorVersion = "2.3.11"

val applicationId = "ru.herobrine1st.e621"
val versionCode = getCommitIndexNumber()
Expand Down Expand Up @@ -115,17 +116,17 @@ configurations.all {
@Suppress("SpellCheckingInspection")
dependencies {
// Android core
implementation("androidx.core:core-ktx:1.12.0") // Apache 2.0
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") // Apache 2.0
implementation("androidx.core:core-ktx:1.13.1") // Apache 2.0
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.0") // Apache 2.0

// Jetpack Compose (Apache 2.0)
implementation("androidx.compose.ui:ui:1.6.4")
implementation("androidx.compose.ui:ui:1.6.7")
implementation("androidx.compose.material3:material3:1.2.1")
implementation("androidx.compose.ui:ui-tooling-preview:1.6.4")
implementation("androidx.compose.material:material-icons-extended:1.6.4")
implementation("androidx.activity:activity-compose:1.8.2")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
implementation("androidx.compose.ui:ui-util:1.6.4")
implementation("androidx.compose.ui:ui-tooling-preview:1.6.7")
implementation("androidx.compose.material:material-icons-extended:1.6.7")
implementation("androidx.activity:activity-compose:1.9.0")
// implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
implementation("androidx.compose.ui:ui-util:1.6.7")

// Decompose
val decomposeVersion = "2.2.2"
Expand All @@ -139,7 +140,7 @@ dependencies {
ksp("androidx.room:room-compiler:$roomVersion") // Not included in binary result

// Jetpack Datastore
implementation("androidx.datastore:datastore:1.0.0") // Apache 2.0
implementation("androidx.datastore:datastore:1.1.1") // Apache 2.0
implementation("com.google.protobuf:protobuf-javalite:$protobufVersion") // BSD 3-clause

// Coroutine Image Loader (Apache 2.0)
Expand All @@ -163,29 +164,29 @@ dependencies {
"profileableImplementation"("androidx.tracing:tracing-perfetto-binary:1.0.0")

// Jetpack Media3
implementation("androidx.media3:media3-exoplayer:1.3.0")
implementation("androidx.media3:media3-ui:1.3.0")
implementation("androidx.media3:media3-datasource-okhttp:1.3.0")
implementation("androidx.media3:media3-exoplayer:1.3.1")
implementation("androidx.media3:media3-ui:1.3.1")
implementation("androidx.media3:media3-datasource-okhttp:1.3.1")

// Other libraries
implementation("org.jsoup:jsoup:1.17.2") // Expat License
implementation("com.mikepenz:aboutlibraries-compose-m3:11.1.1") // Apache 2.0
implementation("com.mikepenz:aboutlibraries-compose-m3:11.2.0") // Apache 2.0
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0")

// Tests
testImplementation("junit:junit:4.13.2")
testImplementation("org.robolectric:robolectric:4.12")
testImplementation("androidx.compose.ui:ui-test-junit4:1.6.4")
testImplementation("org.mockito:mockito-core:5.11.0")
testImplementation("org.robolectric:robolectric:4.12.2")
testImplementation("androidx.compose.ui:ui-test-junit4:1.6.7")
testImplementation("org.mockito:mockito-core:5.12.0")
testImplementation("org.mockito:mockito-inline:5.2.0")
testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1")
testImplementation("androidx.test:core:1.5.0")
androidTestImplementation("androidx.test:core-ktx:1.5.0")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
debugImplementation("androidx.compose.ui:ui-tooling:1.6.4")
debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.4")
debugImplementation("androidx.compose.ui:ui-tooling:1.6.7")
debugImplementation("androidx.compose.ui:ui-test-manifest:1.6.7")
}

protobuf {
Expand Down
9 changes: 5 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.3.1" apply false
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
id("com.google.devtools.ksp") version "1.9.23-1.0.19" apply false
id("com.android.application") version "8.3.2" apply false
id("org.jetbrains.kotlin.android") version "2.0.0" apply false
id("com.google.devtools.ksp") version "2.0.0-1.0.21" apply false
id("com.google.protobuf") version "0.9.4" apply false
id("com.mikepenz.aboutlibraries.plugin") version "11.1.1" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.23" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0" apply false
id("androidx.room") version "2.6.1" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false
}

buildscript {
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonTransitiveRClass=true
ksp.useKSP2=true

0 comments on commit 961a6f2

Please sign in to comment.