Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
WhiredPlanck committed Dec 12, 2023
1 parent eaf68b0 commit 6157d6a
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 36 deletions.
50 changes: 26 additions & 24 deletions app/build.gradle.kts
Expand Up @@ -17,8 +17,8 @@ import java.text.SimpleDateFormat
plugins {
id("com.android.application")
kotlin("android")
kotlin("plugin.serialization") version "1.8.0"
id("com.google.devtools.ksp") version "1.8.0-1.0.8"
kotlin("plugin.serialization") version Versions.kotlin
id("com.google.devtools.ksp") version Versions.ksp
id("com.mikepenz.aboutlibraries.plugin")
}

Expand Down Expand Up @@ -60,7 +60,8 @@ fun buildInfo(): String {

android {
namespace = "com.osfans.trime"
compileSdk = 33
compileSdk = 34
buildToolsVersion = "34.0.0"
ndkVersion = "25.2.9519653"

defaultConfig {
Expand Down Expand Up @@ -120,6 +121,7 @@ android {
}

buildFeatures {
buildConfig = true
viewBinding = true
}

Expand All @@ -129,7 +131,7 @@ android {
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_1_8.toString()
}

// hack workaround lint gradle 8.0.2
Expand Down Expand Up @@ -204,31 +206,31 @@ dependencies {
ksp(project(":codegen"))
implementation("com.blankj:utilcodex:1.31.1")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("com.github.getActivity:XXPermissions:16.2")
implementation("com.charleskorn.kaml:kaml:0.52.0")
implementation("com.mikepenz:aboutlibraries-core:10.6.1")
implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.appcompat:appcompat:1.6.0")
implementation("com.github.getActivity:XXPermissions:18.5")
implementation("com.charleskorn.kaml:kaml:0.56.0")
implementation("com.mikepenz:aboutlibraries-core:${Versions.aboutlibraries}")
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.preference:preference-ktx:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.viewpager2:viewpager2:1.0.0")
implementation("androidx.fragment:fragment-ktx:1.5.4")
implementation("androidx.navigation:navigation-fragment-ktx:${Extra.navVersion}")
implementation("androidx.navigation:navigation-ui-ktx:${Extra.navVersion}")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Extra.kotlinVersion}")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Extra.kotlinCoroutinesVersion}")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Extra.kotlinCoroutinesVersion}")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
implementation("androidx.navigation:navigation-fragment-ktx:${Versions.navigation}")
implementation("androidx.navigation:navigation-ui-ktx:${Versions.navigation}")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinCoroutines}")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.kotlinCoroutines}")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.1")
implementation("com.google.android.flexbox:flexbox:3.0.0")
implementation("com.louiscad.splitties:splitties-bitflags:${Extra.splittiesVersion}")
implementation("com.louiscad.splitties:splitties-systemservices:${Extra.splittiesVersion}")
implementation("com.louiscad.splitties:splitties-views-dsl:${Extra.splittiesVersion}")
implementation("com.louiscad.splitties:splitties-views-dsl-constraintlayout:${Extra.splittiesVersion}")
implementation("com.louiscad.splitties:splitties-views-dsl-recyclerview:${Extra.splittiesVersion}")
implementation("com.louiscad.splitties:splitties-views-recyclerview:${Extra.splittiesVersion}")
implementation("androidx.room:room-runtime:${Extra.roomVersion}")
ksp("androidx.room:room-compiler:${Extra.roomVersion}")
implementation("androidx.room:room-ktx:${Extra.roomVersion}")
implementation("com.louiscad.splitties:splitties-bitflags:${Versions.splitties}")
implementation("com.louiscad.splitties:splitties-systemservices:${Versions.splitties}")
implementation("com.louiscad.splitties:splitties-views-dsl:${Versions.splitties}")
implementation("com.louiscad.splitties:splitties-views-dsl-constraintlayout:${Versions.splitties}")
implementation("com.louiscad.splitties:splitties-views-dsl-recyclerview:${Versions.splitties}")
implementation("com.louiscad.splitties:splitties-views-recyclerview:${Versions.splitties}")
implementation("androidx.room:room-runtime:${Versions.room}")
ksp("androidx.room:room-compiler:${Versions.room}")
implementation("androidx.room:room-ktx:${Versions.room}")

// Testing
testImplementation("junit:junit:4.13.2")
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Expand Up @@ -7,11 +7,11 @@
*/

plugins {
id("com.android.application") version "8.0.2" apply false
id("com.android.library") version "8.0.2" apply false
kotlin("android") version Extra.kotlinVersion apply false
id("com.android.application") version Versions.androidGradlePlugin apply false
id("com.android.library") version Versions.androidGradlePlugin apply false
kotlin("android") version Versions.kotlin apply false
id("com.diffplug.spotless") version "6.22.0"
id("com.mikepenz.aboutlibraries.plugin") version "10.6.1" apply false
id("com.mikepenz.aboutlibraries.plugin") version Versions.aboutlibraries apply false
}

spotless {
Expand Down
7 changes: 0 additions & 7 deletions buildSrc/src/main/kotlin/Extra.kt

This file was deleted.

10 changes: 10 additions & 0 deletions buildSrc/src/main/kotlin/Versions.kt
@@ -0,0 +1,10 @@
object Versions {
val androidGradlePlugin = "8.2.0"
val kotlin = "1.9.20"
val kotlinCoroutines = "1.7.3"
val ksp = "1.9.20-1.0.14"
val navigation = "2.7.5"
val room = "2.6.1"
val splitties = "3.0.0"
val aboutlibraries = "10.9.2"
}

0 comments on commit 6157d6a

Please sign in to comment.