Skip to content

Commit fff50e9

Browse files
committed
Merge branch 'dev' of github.com:OxygenCobalt/Auxio into dev
2 parents 880ab7e + 23b7432 commit fff50e9

2 files changed

Lines changed: 15 additions & 10 deletions

File tree

app/build.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ plugins {
1414
android {
1515
// Auxio implicitly depends on the native modules, explicitly specify it
1616
// here so the libraries are still stripped.
17-
compileSdk target_sdk
1817
ndkVersion ndk_version
1918
namespace "org.oxycblt.auxio"
2019

@@ -35,6 +34,12 @@ android {
3534
targetCompatibility JavaVersion.VERSION_17
3635
}
3736

37+
java {
38+
toolchain {
39+
languageVersion = JavaLanguageVersion.of(17)
40+
}
41+
}
42+
3843
buildTypes {
3944
debug {
4045
applicationIdSuffix ".debug"
@@ -89,7 +94,7 @@ dependencies {
8994
// General
9095
implementation "androidx.core:core-ktx:$core_version"
9196
implementation "androidx.appcompat:appcompat:1.7.1"
92-
implementation "androidx.activity:activity-ktx:1.12.2"
97+
implementation "androidx.activity:activity-ktx:1.13.0"
9398
// noinspection GradleDependency
9499
implementation "androidx.fragment:fragment-ktx:1.6.2"
95100

@@ -144,12 +149,12 @@ dependencies {
144149
implementation project(":media-lib-decoder-ffmpeg")
145150

146151
// Image loading
147-
implementation 'io.coil-kt.coil3:coil-core:3.3.0'
152+
implementation 'io.coil-kt.coil3:coil-core:3.4.0'
148153

149154
// Material
150155
// TODO: Exactly figure out the conditions that the 1.7.0 ripple bug occurred so you can just
151156
// PR a fix.
152-
implementation "com.google.android.material:material:1.14.0-alpha09"
157+
implementation "com.google.android.material:material:1.14.0-alpha10"
153158

154159
// Dependency Injection
155160
implementation "com.google.dagger:dagger:$hilt_version"

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
22
ext {
33
agp_version = '9.1.0'
4-
kotlin_version = '2.2.0'
4+
kotlin_version = '2.3.10'
55
kotlin_coroutines_version = '1.10.2'
6-
navigation_version = "2.9.6"
7-
hilt_version = '2.57.2'
6+
navigation_version = "2.9.7"
7+
hilt_version = '2.59.2'
88
room_version = '2.8.4'
9-
core_version = '1.17.0'
9+
core_version = '1.18.0'
1010
desugaring_version = '2.1.3'
1111

1212
min_sdk = 24
@@ -18,7 +18,7 @@ buildscript {
1818
dependencies {
1919
// Hilt isn't compatible with the new plugin syntax yet.
2020
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
21-
classpath "org.jetbrains.dokka:dokka-gradle-plugin:2.1.0"
21+
classpath "org.jetbrains.dokka:dokka-gradle-plugin:2.2.0"
2222
}
2323
}
2424

@@ -32,7 +32,7 @@ plugins {
3232
id "org.jetbrains.kotlin.android" version "$kotlin_version" apply false
3333
id "com.google.devtools.ksp" version '2.3.2' apply false
3434
// We use spotless in the root build.gradle to apply to all modules.
35-
id "com.diffplug.spotless" version "8.1.0" apply true
35+
id "com.diffplug.spotless" version "8.4.0" apply true
3636
}
3737

3838
spotless {

0 commit comments

Comments
 (0)