Skip to content

Commit 96169d0

Browse files
committed
Upgrade Gradle to 8.8 and related dependencies
1 parent 1d24609 commit 96169d0

File tree

5 files changed

+18
-20
lines changed

5 files changed

+18
-20
lines changed

starter/app/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99

1010
android {
1111
namespace 'com.udacity.project4'
12-
compileSdk 33
12+
compileSdk 34
1313

1414
defaultConfig {
1515
applicationId "com.udacity.project4"
@@ -34,12 +34,9 @@ android {
3434
returnDefaultValues = true
3535
}
3636

37-
// dataBinding {
38-
// enabled = true
39-
// enabledForTests = true
40-
// }
4137
buildFeatures {
4238
dataBinding true
39+
buildConfig true
4340
}
4441
}
4542

@@ -68,6 +65,7 @@ dependencies {
6865

6966
// Koin
7067
implementation "io.insert-koin:koin-android:$koinVersion"
68+
androidTestImplementation("io.insert-koin:koin-test:3.1.6")
7169

7270
// Dependencies for local unit tests
7371
testImplementation "junit:junit:$junitVersion"

starter/app/src/androidTest/java/com/udacity/project4/RemindersActivityTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ import org.koin.androidx.viewmodel.dsl.viewModel
1616
import org.koin.core.context.startKoin
1717
import org.koin.core.context.stopKoin
1818
import org.koin.dsl.module
19-
import org.koin.test.AutoCloseKoinTest
19+
import org.koin.test.KoinTest
2020
import org.koin.test.get
2121

2222
@RunWith(AndroidJUnit4::class)
2323
@LargeTest
2424
//END TO END test to black box test the app
2525
class RemindersActivityTest :
26-
AutoCloseKoinTest() {// Extended Koin Test - embed autoclose @after method to close Koin after every test
26+
KoinTest {// Extended Koin Test - embed autoclose @after method to close Koin after every test
2727

2828
private lateinit var repository: ReminderDataSource
2929
private lateinit var appContext: Application
@@ -49,7 +49,7 @@ class RemindersActivityTest :
4949
get() as ReminderDataSource
5050
)
5151
}
52-
single { RemindersLocalRepository(get()) as ReminderDataSource }
52+
single { RemindersLocalRepository(get()) }
5353
single { LocalDB.createRemindersDao(appContext) }
5454
}
5555
//declare a new koin module

starter/app/src/androidTest/java/com/udacity/project4/util/DataBindingIdlingResource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ fun DataBindingIdlingResource.monitorActivity(
104104
/**
105105
* Sets the fragment from a [FragmentScenario] to be used from [DataBindingIdlingResource].
106106
*/
107-
fun DataBindingIdlingResource.monitorFragment(fragmentScenario: FragmentScenario<out Fragment>) {
107+
fun <T : Fragment> DataBindingIdlingResource.monitorFragment(fragmentScenario: FragmentScenario<T>) {
108108
fragmentScenario.onFragment {
109109
this.activity = it.requireActivity()
110110
}

starter/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22

33
buildscript {
44
ext {
5-
gradleVersion = '7.4.2'
6-
kotlinVersion = '1.8.0'
7-
navigationVersion = '2.5.3'
5+
gradleVersion = '8.4.1'
6+
kotlinVersion = '1.9.23'
7+
navigationVersion = '2.7.7'
88

99
// Sdk and tools
1010
// Support library and architecture components support minSdk 14 and above.
1111
minSdkVersion = 24
1212
targetSdkVersion = 33
1313

1414
// App dependencies
15-
appCompatVersion = '1.6.1'
15+
appCompatVersion = '1.7.0'
1616
archLifecycleVersion = '2.2.0'
17-
archLifecycleKtxVersion = '2.6.1'
18-
materialVersion = '1.8.0'
17+
archLifecycleKtxVersion = '2.8.1'
18+
materialVersion = '1.12.0'
1919
mockitoVersion = '5.2.0'
2020
constraintVersion = '2.1.4'
2121
dexMakerVersion = '2.28.3'
2222
coroutinesVersion = '1.6.4'
23-
roomVersion = '2.5.1'
23+
roomVersion = '2.6.1'
2424
koinVersion = '3.4.0'
2525
truthVersion = '1.1.3'
2626
junitVersion = '4.13.2'
@@ -31,11 +31,11 @@ buildscript {
3131
androidXTestRulesVersion = '1.5.0'
3232
espressoVersion = '3.5.1'
3333
swipeRefreshVersion = '1.1.0'
34-
fragmentTestingVersion = '1.5.6'
35-
playServicesLocationVersion = '21.0.1'
34+
fragmentTestingVersion = '1.7.1'
35+
playServicesLocationVersion = '21.3.0'
3636
playServicesMapsVersion = '18.1.0'
3737
firebaseUiAuthVersion = '8.0.2'
38-
firebaseAuthKtxVersion = '21.2.0'
38+
firebaseAuthKtxVersion = '23.0.0'
3939
}
4040

4141
repositories {

starter/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip

0 commit comments

Comments
 (0)