Skip to content

Commit 6e45ae1

Browse files
chore: dependencies upgrade (#461)
1 parent 8de8a4d commit 6e45ae1

File tree

14 files changed

+66
-34
lines changed

14 files changed

+66
-34
lines changed

app/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,11 @@ android {
9191
sourceCompatibility java_version
9292
targetCompatibility java_version
9393
}
94-
kotlinOptions {
95-
jvmTarget = java_version
96-
freeCompilerArgs = List.of("-Xstring-concat=inline")
94+
kotlin {
95+
compilerOptions {
96+
jvmTarget = jvm_target_version
97+
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
98+
}
9799
}
98100
buildFeatures {
99101
viewBinding true

app/proguard-rules.pro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,7 @@
6969
-dontwarn org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter
7070
-dontwarn com.android.billingclient.api.BillingClientStateListener
7171
-dontwarn com.android.billingclient.api.PurchasesUpdatedListener
72+
-dontwarn com.google.crypto.tink.subtle.XChaCha20Poly1305
73+
-dontwarn net.jcip.annotations.GuardedBy
74+
-dontwarn net.jcip.annotations.Immutable
75+
-dontwarn net.jcip.annotations.ThreadSafe

auth/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@ android {
4141
sourceCompatibility java_version
4242
targetCompatibility java_version
4343
}
44-
kotlinOptions {
45-
jvmTarget = java_version
44+
kotlin {
45+
compilerOptions {
46+
jvmTarget = jvm_target_version
47+
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
48+
}
4649
}
4750
buildFeatures {
4851
viewBinding true

build.gradle

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
import io.gitlab.arturbosch.detekt.Detekt
22
import org.edx.builder.ConfigHelper
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
34

45
import java.util.regex.Matcher
56
import java.util.regex.Pattern
67

78
buildscript {
89
ext {
910
// Plugin versions
10-
android_gradle_plugin_version = '8.12.0'
11+
android_gradle_plugin_version = '8.12.2'
1112
google_services_version = '4.4.3'
1213
firebase_crashlytics_version = '3.0.6'
13-
ksp_version = '2.0.0-1.0.24'
14+
ksp_version = '2.2.10-2.0.2'
1415

1516
//Depends on versions in OEXFoundation
16-
kotlin_version = '2.0.0'
17-
room_version = '2.6.1'
18-
detekt_version = '1.23.7'
17+
kotlin_version = '2.2.10'
18+
room_version = '2.7.2'
19+
detekt_version = '1.23.8'
1920

2021
// Library versions
2122
media3_version = "1.8.0"
2223
youtubeplayer_version = "11.1.0"
2324
firebase_version = "33.0.0"
24-
jsoup_version = '1.21.1'
25+
jsoup_version = '1.21.2'
2526
in_app_review = '2.0.2'
2627
extented_spans_version = "1.4.0"
2728
zip_version = '2.11.5'
@@ -31,7 +32,7 @@ buildscript {
3132
play_services_ads_identifier_version = '18.2.0'
3233
install_referrer_version = '2.2'
3334
snakeyaml_version = '2.4'
34-
openedx_foundation_version = '1.0.1'
35+
openedx_foundation_version = '1.0.2'
3536
openedx_firebase_analytics_version = '1.0.1'
3637
braze_sdk_version = '37.0.0'
3738

@@ -84,6 +85,7 @@ ext {
8485
target_sdk_version = 36
8586
min_sdk_version = 24
8687
java_version = JavaVersion.VERSION_17
88+
jvm_target_version = JvmTarget.JVM_17
8789

8890
configHelper = new ConfigHelper(projectDir, getCurrentFlavor())
8991
}

core/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,12 @@ android {
7979
sourceCompatibility java_version
8080
targetCompatibility java_version
8181
}
82-
kotlinOptions {
83-
jvmTarget = java_version
84-
freeCompilerArgs = List.of("-Xstring-concat=inline")
82+
kotlin {
83+
compilerOptions {
84+
jvmTarget = jvm_target_version
85+
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
86+
}
8587
}
86-
8788
buildFeatures {
8889
viewBinding true
8990
compose true

core/src/main/java/org/openedx/core/ui/theme/Theme.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.openedx.core.ui.theme
22

33
import androidx.compose.foundation.ExperimentalFoundationApi
4-
import androidx.compose.foundation.LocalOverscrollConfiguration
4+
import androidx.compose.foundation.LocalOverscrollFactory
55
import androidx.compose.foundation.isSystemInDarkTheme
66
import androidx.compose.material.MaterialTheme
77
import androidx.compose.material.darkColors
@@ -210,7 +210,7 @@ fun OpenEdXTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composabl
210210
shapes = LocalShapes.current.material,
211211
) {
212212
CompositionLocalProvider(
213-
LocalOverscrollConfiguration provides null,
213+
LocalOverscrollFactory provides null,
214214
content = content
215215
)
216216
}

course/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ android {
2828
sourceCompatibility java_version
2929
targetCompatibility java_version
3030
}
31-
kotlinOptions {
32-
jvmTarget = java_version
31+
kotlin {
32+
compilerOptions {
33+
jvmTarget = jvm_target_version
34+
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
35+
}
3336
}
3437

3538
buildFeatures {

course/src/main/java/org/openedx/course/presentation/unit/container/CourseUnitContainerFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class CourseUnitContainerFragment : Fragment(R.layout.fragment_course_unit_conta
169169
}
170170

171171
private fun setupMediaRouteButton() {
172-
binding.mediaRouteButton.setAlwaysVisible(true)
172+
binding.mediaRouteButton.visibility = View.VISIBLE
173173
CastButtonFactory.setUpMediaRouteButton(requireContext(), binding.mediaRouteButton)
174174
}
175175

dashboard/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@ android {
2727
sourceCompatibility java_version
2828
targetCompatibility java_version
2929
}
30-
kotlinOptions {
31-
jvmTarget = java_version
30+
kotlin {
31+
compilerOptions {
32+
jvmTarget = jvm_target_version
33+
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
34+
}
3235
}
3336

3437
buildFeatures {

discovery/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@ android {
2929
sourceCompatibility java_version
3030
targetCompatibility java_version
3131
}
32-
kotlinOptions {
33-
jvmTarget = java_version
32+
kotlin {
33+
compilerOptions {
34+
jvmTarget = jvm_target_version
35+
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
36+
}
3437
}
3538

3639
buildFeatures {

0 commit comments

Comments
 (0)