Skip to content

Commit 6a4500c

Browse files
committed
Merge branch 'develop' of https://github.com/openedx/openedx-app-android into SAML_SSO
# Conflicts: # app/src/main/java/org/openedx/app/AppActivity.kt # auth/build.gradle # auth/src/main/java/org/openedx/auth/presentation/sso/BrowserAuthHelper.kt # build.gradle # gradle/wrapper/gradle-wrapper.properties
2 parents 135a305 + 6e45ae1 commit 6a4500c

File tree

174 files changed

+7505
-2342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+7505
-2342
lines changed

app/build.gradle

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ if (firebaseEnabled) {
2828
}
2929

3030
android {
31-
compileSdk 34
31+
namespace 'org.openedx.app'
32+
compileSdkVersion compile_sdk_version
3233

3334
defaultConfig {
3435
applicationId appId
35-
minSdk 24
36-
targetSdk 34
36+
minSdk min_sdk_version
37+
targetSdk target_sdk_version
3738
versionCode 1
3839
versionName "1.0.0"
3940

@@ -42,7 +43,6 @@ android {
4243
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4344
}
4445

45-
namespace 'org.openedx.app'
4646

4747
flavorDimensions += "env"
4848
productFlavors {
@@ -88,12 +88,14 @@ android {
8888
}
8989
}
9090
compileOptions {
91-
sourceCompatibility JavaVersion.VERSION_17
92-
targetCompatibility JavaVersion.VERSION_17
91+
sourceCompatibility java_version
92+
targetCompatibility java_version
9393
}
94-
kotlinOptions {
95-
jvmTarget = JavaVersion.VERSION_17
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
@@ -129,19 +131,19 @@ dependencies {
129131

130132
ksp "androidx.room:room-compiler:$room_version"
131133

132-
implementation 'androidx.core:core-splashscreen:1.0.1'
134+
implementation "androidx.core:core-splashscreen:$core_splashscreen_version"
133135

134136
api platform("com.google.firebase:firebase-bom:$firebase_version")
135137
api "com.google.firebase:firebase-messaging"
136138

137139
// Braze SDK Integration
138-
implementation "com.braze:android-sdk-ui:30.2.0"
140+
implementation "com.braze:android-sdk-ui:$braze_sdk_version"
139141

140142
// Plugins
141-
implementation("com.github.openedx:openedx-app-firebase-analytics-android:1.0.0")
143+
implementation("com.github.openedx:openedx-app-firebase-analytics-android:$openedx_firebase_analytics_version")
142144

143-
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
144-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
145+
androidTestImplementation "androidx.test.ext:junit:$test_ext_version"
146+
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
145147
testImplementation "junit:junit:$junit_version"
146148
testImplementation "io.mockk:mockk:$mockk_version"
147149
testImplementation "io.mockk:mockk-android:$mockk_version"

app/proguard-rules.pro

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,9 @@
6767
-dontwarn org.bouncycastle.openssl.PEMKeyPair
6868
-dontwarn org.bouncycastle.openssl.PEMParser
6969
-dontwarn org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter
70+
-dontwarn com.android.billingclient.api.BillingClientStateListener
71+
-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

0 commit comments

Comments
 (0)