Skip to content

Commit 9fbf64f

Browse files
authored
Merge pull request #399 from skydoves/fix/build-broken
Fix build failure
2 parents 8d5a063 + 4b96d76 commit 9fbf64f

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
# Java class files
99
*.class
1010

11+
# Kotlin
12+
.kotlin
13+
1114
# Generated files
1215
bin/
1316
gen/

app/build.gradle.kts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ android {
5050
sourceSets.configureEach {
5151
kotlin.srcDir(layout.buildDirectory.files("generated/ksp/$name/kotlin/"))
5252
}
53-
sourceSets.all {
54-
languageSettings {
55-
languageVersion = "2.0"
56-
}
57-
}
5853
}
5954

6055
testOptions {
@@ -80,7 +75,7 @@ androidComponents {
8075
project.tasks.findByName("dataBindingGenBaseClasses" + variant.name.capitalized()) as? DataBindingGenBaseClassesTask
8176
if (dataBindingTask != null) {
8277
project.tasks.getByName("ksp" + variant.name.capitalized() + "Kotlin") {
83-
(this as AbstractKotlinCompileTool<*>).setSource(dataBindingTask.sourceOutFolder)
78+
(this as? AbstractKotlinCompileTool<*>)?.setSource(dataBindingTask.sourceOutFolder)
8479
}
8580
}
8681
}
@@ -116,6 +111,9 @@ dependencies {
116111
// coroutines
117112
implementation(libs.coroutines)
118113

114+
// network
115+
implementation(libs.okhttp.interceptor)
116+
119117
// whatIf
120118
implementation(libs.whatif)
121119

gradle/libs.versions.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
targetSdk = "35"
2+
targetSdk = "36"
33
jvmBytecode = "17"
44
agp = "8.13.0"
55
kotlin = "2.2.20"
@@ -15,20 +15,20 @@ androidXStartup = "1.2.0"
1515
androidxPalette = "1.0.0"
1616
bindables = "1.2.0"
1717
hilt = "2.57.2"
18-
retrofit = "2.12.0"
19-
okHttp = "4.12.0"
18+
retrofit = "3.0.0"
19+
okHttp = "5.2.1"
2020
sandwich = "2.1.3"
2121
moshi = "1.15.2"
2222
coroutines = "1.10.2"
2323
whatIf = "1.2.1"
24-
glide = "4.16.0"
24+
glide = "5.0.5"
2525
bundler = "1.0.4"
2626
transformationLayout = "1.1.6"
2727
recyclerView = "1.4.0"
2828
baseAdapter = "1.0.4"
2929
androidRibbon = "1.0.4"
3030
progressView = "1.1.3"
31-
rainbow = "1.0.4"
31+
rainbow = "1.1.0"
3232
timber = "5.0.1"
3333
baselineProfiles = "1.4.1"
3434
macroBenchmark = "1.4.1"
@@ -73,7 +73,6 @@ bindables = { module = "com.github.skydoves:bindables", version.ref = "bindables
7373
hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
7474
hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
7575
hilt-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" }
76-
hilt-plugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
7776
sandwich = { module = "com.github.skydoves:sandwich-retrofit", version.ref = "sandwich" }
7877
retrofit = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
7978
retrofit-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" }

settings.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
//limitations under the License.
1616

1717
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
18-
19-
20-
2118
pluginManagement {
2219
repositories {
2320
// fetch plugins from google maven (https://maven.google.com)
@@ -67,7 +64,7 @@ plugins {
6764

6865
android {
6966
minSdk = 23
70-
compileSdk = 35
67+
compileSdk = 36
7168
}
7269

7370
dependencyResolutionManagement {

0 commit comments

Comments
 (0)