Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,11 @@ android {
sourceCompatibility java_version
targetCompatibility java_version
}
kotlinOptions {
jvmTarget = java_version
freeCompilerArgs = List.of("-Xstring-concat=inline")
kotlin {
compilerOptions {
jvmTarget = jvm_target_version
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
}
}
buildFeatures {
viewBinding true
Expand Down
4 changes: 4 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,7 @@
-dontwarn org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter
-dontwarn com.android.billingclient.api.BillingClientStateListener
-dontwarn com.android.billingclient.api.PurchasesUpdatedListener
-dontwarn com.google.crypto.tink.subtle.XChaCha20Poly1305
-dontwarn net.jcip.annotations.GuardedBy
-dontwarn net.jcip.annotations.Immutable
-dontwarn net.jcip.annotations.ThreadSafe
7 changes: 5 additions & 2 deletions auth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,11 @@ android {
sourceCompatibility java_version
targetCompatibility java_version
}
kotlinOptions {
jvmTarget = java_version
kotlin {
compilerOptions {
jvmTarget = jvm_target_version
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
}
}
buildFeatures {
viewBinding true
Expand Down
16 changes: 9 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.edx.builder.ConfigHelper
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

import java.util.regex.Matcher
import java.util.regex.Pattern

buildscript {
ext {
// Plugin versions
android_gradle_plugin_version = '8.12.0'
android_gradle_plugin_version = '8.12.2'
google_services_version = '4.4.3'
firebase_crashlytics_version = '3.0.6'
ksp_version = '2.0.0-1.0.24'
ksp_version = '2.2.10-2.0.2'

//Depends on versions in OEXFoundation
kotlin_version = '2.0.0'
room_version = '2.6.1'
detekt_version = '1.23.7'
kotlin_version = '2.2.10'
room_version = '2.7.2'
detekt_version = '1.23.8'

// Library versions
media3_version = "1.8.0"
youtubeplayer_version = "11.1.0"
firebase_version = "33.0.0"
jsoup_version = '1.21.1'
jsoup_version = '1.21.2'
in_app_review = '2.0.2'
extented_spans_version = "1.4.0"
zip_version = '2.11.5'
Expand All @@ -31,7 +32,7 @@ buildscript {
play_services_ads_identifier_version = '18.2.0'
install_referrer_version = '2.2'
snakeyaml_version = '2.4'
openedx_foundation_version = '1.0.1'
openedx_foundation_version = '1.0.2'
openedx_firebase_analytics_version = '1.0.1'
braze_sdk_version = '37.0.0'

Expand Down Expand Up @@ -84,6 +85,7 @@ ext {
target_sdk_version = 36
min_sdk_version = 24
java_version = JavaVersion.VERSION_17
jvm_target_version = JvmTarget.JVM_17

configHelper = new ConfigHelper(projectDir, getCurrentFlavor())
}
Expand Down
9 changes: 5 additions & 4 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,12 @@ android {
sourceCompatibility java_version
targetCompatibility java_version
}
kotlinOptions {
jvmTarget = java_version
freeCompilerArgs = List.of("-Xstring-concat=inline")
kotlin {
compilerOptions {
jvmTarget = jvm_target_version
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
}
}

buildFeatures {
viewBinding true
compose true
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/openedx/core/ui/theme/Theme.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.openedx.core.ui.theme

import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.LocalOverscrollConfiguration
import androidx.compose.foundation.LocalOverscrollFactory
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material.MaterialTheme
import androidx.compose.material.darkColors
Expand Down Expand Up @@ -210,7 +210,7 @@ fun OpenEdXTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composabl
shapes = LocalShapes.current.material,
) {
CompositionLocalProvider(
LocalOverscrollConfiguration provides null,
LocalOverscrollFactory provides null,
content = content
)
}
Expand Down
7 changes: 5 additions & 2 deletions course/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ android {
sourceCompatibility java_version
targetCompatibility java_version
}
kotlinOptions {
jvmTarget = java_version
kotlin {
compilerOptions {
jvmTarget = jvm_target_version
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
}
}

buildFeatures {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class CourseUnitContainerFragment : Fragment(R.layout.fragment_course_unit_conta
}

private fun setupMediaRouteButton() {
binding.mediaRouteButton.setAlwaysVisible(true)
binding.mediaRouteButton.visibility = View.VISIBLE
CastButtonFactory.setUpMediaRouteButton(requireContext(), binding.mediaRouteButton)
}

Expand Down
7 changes: 5 additions & 2 deletions dashboard/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ android {
sourceCompatibility java_version
targetCompatibility java_version
}
kotlinOptions {
jvmTarget = java_version
kotlin {
compilerOptions {
jvmTarget = jvm_target_version
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
}
}

buildFeatures {
Expand Down
7 changes: 5 additions & 2 deletions discovery/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@ android {
sourceCompatibility java_version
targetCompatibility java_version
}
kotlinOptions {
jvmTarget = java_version
kotlin {
compilerOptions {
jvmTarget = jvm_target_version
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
}
}

buildFeatures {
Expand Down
7 changes: 5 additions & 2 deletions discussion/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ android {
sourceCompatibility java_version
targetCompatibility java_version
}
kotlinOptions {
jvmTarget = java_version
kotlin {
compilerOptions {
jvmTarget = jvm_target_version
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
}
}

buildFeatures {
Expand Down
7 changes: 5 additions & 2 deletions downloads/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@ android {
sourceCompatibility java_version
targetCompatibility java_version
}
kotlinOptions {
jvmTarget = java_version
kotlin {
compilerOptions {
jvmTarget = jvm_target_version
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
}
}

buildFeatures {
Expand Down
7 changes: 5 additions & 2 deletions profile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ android {
sourceCompatibility java_version
targetCompatibility java_version
}
kotlinOptions {
jvmTarget = java_version
kotlin {
compilerOptions {
jvmTarget = jvm_target_version
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
}
}

buildFeatures {
Expand Down
8 changes: 5 additions & 3 deletions whatsnew/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ android {
sourceCompatibility java_version
targetCompatibility java_version
}
kotlinOptions {
jvmTarget = java_version
freeCompilerArgs = List.of("-Xstring-concat=inline")
kotlin {
compilerOptions {
jvmTarget = jvm_target_version
freeCompilerArgs = ['-XXLanguage:+PropertyParamAnnotationDefaultTargetMode']
}
}

buildFeatures {
Expand Down
Loading