Skip to content

Commit e901a03

Browse files
PavloNetrebchukPavloNetrebchuk
authored
Dependency versions upgrade (#39)
* Upgraded targetSdk, kotlin, compose, java, fragment, room, gradle versions
1 parent e2bb328 commit e901a03

File tree

19 files changed

+145
-119
lines changed

19 files changed

+145
-119
lines changed

‎.github/workflows/unit_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
# Ensure we are building the branch and not the branch after being merged on develop
2828
# https://github.com/actions/checkout/issues/881
2929
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
30-
- name: ☕️ Use JDK 11
30+
- name: ☕️ Use JDK 17
3131
uses: actions/setup-java@v3
3232
with:
3333
distribution: 'temurin' # See 'Supported distributions' for available options
34-
java-version: '11'
34+
java-version: '17'
3535
- name: Configure gradle
3636
uses: gradle/[email protected]
3737
with:

‎app/build.gradle‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ plugins {
77
}
88

99
android {
10-
compileSdk 33
10+
compileSdk 34
1111

1212
defaultConfig {
1313
applicationId "org.openedx.app"
1414
minSdk 24
15-
targetSdk 33
15+
targetSdk 34
1616
versionCode 1
1717
versionName "1.0"
1818

@@ -23,13 +23,16 @@ android {
2323

2424
namespace 'org.openedx.app'
2525

26-
flavorDimensions "tier"
26+
flavorDimensions += "env"
2727
productFlavors {
2828
prod {
29+
dimension 'env'
2930
}
3031
develop {
32+
dimension 'env'
3133
}
3234
stage {
35+
dimension 'env'
3336
}
3437
}
3538

@@ -40,11 +43,11 @@ android {
4043
}
4144
}
4245
compileOptions {
43-
sourceCompatibility JavaVersion.VERSION_11
44-
targetCompatibility JavaVersion.VERSION_11
46+
sourceCompatibility JavaVersion.VERSION_17
47+
targetCompatibility JavaVersion.VERSION_17
4548
}
4649
kotlinOptions {
47-
jvmTarget = JavaVersion.VERSION_11
50+
jvmTarget = JavaVersion.VERSION_17
4851
}
4952
buildFeatures {
5053
viewBinding true
@@ -82,8 +85,8 @@ dependencies {
8285

8386
implementation 'androidx.core:core-splashscreen:1.0.1'
8487

85-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
86-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
88+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
89+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
8790
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
8891
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
8992
testImplementation "junit:junit:$junit_version"

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
android:name=".AppActivity"
2828
android:exported="true"
2929
android:fitsSystemWindows="true"
30-
android:label="@string/app_name"
3130
android:screenOrientation="portrait"
3231
android:theme="@style/Theme.App.Starting"
3332
android:windowSoftInputMode="adjustPan">

‎auth/build.gradle‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,28 @@ plugins {
55
}
66

77
android {
8-
compileSdk 33
8+
compileSdk 34
99

1010
defaultConfig {
1111
minSdk 24
12-
targetSdk 33
12+
targetSdk 34
1313

1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
consumerProguardFiles "consumer-rules.pro"
1616
}
1717

1818
namespace 'org.openedx.auth'
1919

20-
flavorDimensions "tier"
20+
flavorDimensions += "env"
2121
productFlavors {
2222
prod {
23+
dimension 'env'
2324
}
2425
develop {
26+
dimension 'env'
2527
}
2628
stage {
29+
dimension 'env'
2730
}
2831
}
2932

@@ -34,11 +37,11 @@ android {
3437
}
3538
}
3639
compileOptions {
37-
sourceCompatibility JavaVersion.VERSION_11
38-
targetCompatibility JavaVersion.VERSION_11
40+
sourceCompatibility JavaVersion.VERSION_17
41+
targetCompatibility JavaVersion.VERSION_17
3942
}
4043
kotlinOptions {
41-
jvmTarget = JavaVersion.VERSION_11
44+
jvmTarget = JavaVersion.VERSION_17
4245
}
4346
buildFeatures {
4447
viewBinding true
@@ -52,8 +55,8 @@ android {
5255
dependencies {
5356
implementation project(path: ':core')
5457

55-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
56-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
58+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
59+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
5760
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
5861
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
5962
testImplementation "junit:junit:$junit_version"

‎auth/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
buildscript {
22
ext {
3-
kotlin_version = '1.8.10'
3+
kotlin_version = '1.8.21'
44
coroutines_version = '1.7.1'
5-
compose_version = '1.4.3'
6-
compose_compiler_version = '1.4.4'
5+
compose_version = '1.5.0'
6+
compose_compiler_version = '1.4.7'
77
}
88
}
99

1010
plugins {
11-
id 'com.android.application' version '7.4.2' apply false
12-
id 'com.android.library' version '7.4.2' apply false
11+
id 'com.android.application' version '8.1.0' apply false
12+
id 'com.android.library' version '8.1.0' apply false
1313
id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
1414
id 'com.google.gms.google-services' version '4.3.15' apply false
1515
id "com.google.firebase.crashlytics" version "2.9.6" apply false
@@ -24,7 +24,7 @@ ext {
2424
appcompat_version = "1.6.1"
2525
material_version = "1.9.0"
2626
lifecycle_version = "2.6.1"
27-
fragment_version = "1.6.0"
27+
fragment_version = "1.6.1"
2828
constraintlayout_version = "2.1.4"
2929
viewpager2_version = "1.0.0"
3030
exoplayer_version = "2.18.7"
@@ -41,14 +41,14 @@ ext {
4141

4242
jsoup_version = '1.13.1'
4343

44-
room_version = '2.5.1'
44+
room_version = '2.5.2'
4545

4646
work_version = '2.8.1'
4747

4848
window_version = '1.1.0'
4949

5050
//testing
5151
mockk_version = '1.13.3'
52-
android_arch_version = '2.1.0'
52+
android_arch_version = '2.2.0'
5353
junit_version = '4.13.2'
5454
}

‎core/build.gradle‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,23 @@ plugins {
2121
def config = new Yaml().load(new File("config.yaml").newInputStream())
2222

2323
android {
24-
compileSdk 33
24+
compileSdk 34
2525

2626
defaultConfig {
2727
minSdk 24
28-
targetSdk 33
28+
targetSdk 34
2929

3030
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3131
consumerProguardFiles "consumer-rules.pro"
3232
}
3333

3434
namespace 'org.openedx.core'
3535

36-
flavorDimensions "tier"
36+
flavorDimensions += "env"
3737
productFlavors {
3838
prod {
39+
dimension 'env'
40+
3941
def envMap = config.environments.find { it.key == "PROD" }
4042
def clientId = envMap.value.OAUTH_CLIENT_ID
4143
def envUrls = envMap.value.URLS
@@ -55,6 +57,8 @@ android {
5557
resValue "string", "feedback_email_address", envUrls.FEEDBACK_EMAIL_ADDRESS
5658
}
5759
develop {
60+
dimension 'env'
61+
5862
def envMap = config.environments.find { it.key == "DEV" }
5963
def clientId = envMap.value.OAUTH_CLIENT_ID
6064
def envUrls = envMap.value.URLS
@@ -74,6 +78,8 @@ android {
7478
resValue "string", "feedback_email_address", envUrls.FEEDBACK_EMAIL_ADDRESS
7579
}
7680
stage {
81+
dimension 'env'
82+
7783
def envMap = config.environments.find { it.key == "STAGE" }
7884
def clientId = envMap.value.OAUTH_CLIENT_ID
7985
def envUrls = envMap.value.URLS
@@ -101,11 +107,11 @@ android {
101107
}
102108
}
103109
compileOptions {
104-
sourceCompatibility JavaVersion.VERSION_11
105-
targetCompatibility JavaVersion.VERSION_11
110+
sourceCompatibility JavaVersion.VERSION_17
111+
targetCompatibility JavaVersion.VERSION_17
106112
}
107113
kotlinOptions {
108-
jvmTarget = JavaVersion.VERSION_11
114+
jvmTarget = JavaVersion.VERSION_17
109115
}
110116

111117
buildFeatures {
@@ -176,8 +182,8 @@ dependencies {
176182
api "com.google.firebase:firebase-analytics-ktx"
177183

178184
testImplementation 'junit:junit:4.13.2'
179-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
180-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
185+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
186+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
181187
}
182188

183189
class FirebaseConfig {

‎course/build.gradle‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ plugins {
55
}
66

77
android {
8-
compileSdk 33
8+
compileSdk 34
99

1010
defaultConfig {
1111
minSdk 24
12-
targetSdk 33
12+
targetSdk 34
1313

1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
consumerProguardFiles "consumer-rules.pro"
@@ -24,11 +24,11 @@ android {
2424
}
2525
}
2626
compileOptions {
27-
sourceCompatibility JavaVersion.VERSION_11
28-
targetCompatibility JavaVersion.VERSION_11
27+
sourceCompatibility JavaVersion.VERSION_17
28+
targetCompatibility JavaVersion.VERSION_17
2929
}
3030
kotlinOptions {
31-
jvmTarget = JavaVersion.VERSION_11
31+
jvmTarget = JavaVersion.VERSION_17
3232
}
3333

3434
buildFeatures {
@@ -39,13 +39,16 @@ android {
3939
kotlinCompilerExtensionVersion = "$compose_compiler_version"
4040
}
4141

42-
flavorDimensions "tier"
42+
flavorDimensions += "env"
4343
productFlavors {
4444
prod {
45+
dimension 'env'
4546
}
4647
develop {
48+
dimension 'env'
4749
}
4850
stage {
51+
dimension 'env'
4952
}
5053
}
5154

@@ -55,15 +58,13 @@ android {
5558
}
5659

5760
dependencies {
58-
5961
implementation project(path: ':core')
6062
implementation project(path: ':discussion')
6163
implementation "com.pierfrancescosoffritti.androidyoutubeplayer:core:$youtubeplayer_version"
6264
implementation "com.google.android.exoplayer:exoplayer:$exoplayer_version"
6365

64-
65-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
66-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
66+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
67+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
6768
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
6869
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
6970
testImplementation "junit:junit:$junit_version"

‎course/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎dashboard/build.gradle‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44
}
55

66
android {
7-
compileSdk 33
7+
compileSdk 34
88

99
defaultConfig {
1010
minSdk 24
11-
targetSdk 33
11+
targetSdk 34
1212

1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
consumerProguardFiles "consumer-rules.pro"
@@ -24,11 +24,11 @@ android {
2424
}
2525

2626
compileOptions {
27-
sourceCompatibility JavaVersion.VERSION_11
28-
targetCompatibility JavaVersion.VERSION_11
27+
sourceCompatibility JavaVersion.VERSION_17
28+
targetCompatibility JavaVersion.VERSION_17
2929
}
3030
kotlinOptions {
31-
jvmTarget = JavaVersion.VERSION_11
31+
jvmTarget = JavaVersion.VERSION_17
3232
}
3333

3434
buildFeatures {
@@ -39,22 +39,25 @@ android {
3939
kotlinCompilerExtensionVersion = "$compose_compiler_version"
4040
}
4141

42-
flavorDimensions "tier"
42+
flavorDimensions += "env"
4343
productFlavors {
4444
prod {
45+
dimension 'env'
4546
}
4647
develop {
48+
dimension 'env'
4749
}
4850
stage {
51+
dimension 'env'
4952
}
5053
}
5154
}
5255

5356
dependencies {
5457
implementation project(path: ':core')
5558

56-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
57-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
59+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
60+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
5861
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
5962
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
6063
testImplementation "junit:junit:$junit_version"

0 commit comments

Comments
 (0)