Skip to content

Commit c21e621

Browse files
Merge pull request #38 from simona-anomis/master
Version & dependencies update
2 parents 302b1ed + 41d9c90 commit c21e621

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ android {
4444
}
4545
kotlinOptions {
4646
jvmTarget = '1.8'
47-
freeCompilerArgs += ["-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"]
4847
}
4948

5049
android.buildFeatures.viewBinding = true

app/src/main/java/com/codelab/android/datastore/data/TasksRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object TasksRepository {
2525

2626
private val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)
2727

28-
// In a real app, this would be coming from a data source like a databases
28+
// In a real app, this would be coming from a data source like a database
2929
val tasks = flowOf(
3030
listOf(
3131
Task(

app/src/main/java/com/codelab/android/datastore/ui/TasksViewModel.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ data class TasksUiModel(
3232
val sortOrder: SortOrder
3333
)
3434

35-
// MutableStateFlow is an experimental API so we're annotating the class accordingly
3635
class TasksViewModel(
3736
repository: TasksRepository,
3837
private val userPreferencesRepository: UserPreferencesRepository

app/src/main/res/layout/task_view_item.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
android:layout_width="0dp"
5151
android:layout_height="wrap_content"
5252
android:textSize="@dimen/task_details_size"
53+
android:textColor="@color/greyAlpha"
54+
app:drawableTint="@color/greyAlpha"
5355
app:layout_constraintStart_toStartOf="parent"
5456
app:layout_constraintTop_toBottomOf="@id/priority"
5557
app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/values-night/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<!-- Secondary brand color. -->
2525
<item name="colorSecondary">@color/teal_200</item>
2626
<item name="colorSecondaryVariant">@color/teal_200</item>
27-
<item name="colorOnSecondary">@color/black</item>
27+
<item name="colorOnSecondary">@color/white</item>
2828
<!-- Status bar color. -->
2929
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
3030
<!-- Customize your theme here. -->

build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616

1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818
buildscript {
19-
ext.kotlin_version = "1.4.30"
19+
ext.kotlin_version = "1.5.30"
2020
repositories {
2121
google()
22-
jcenter()
22+
mavenCentral()
2323
}
2424
dependencies {
25-
classpath 'com.android.tools.build:gradle:4.1.2'
25+
classpath 'com.android.tools.build:gradle:7.0.2'
2626
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2727
}
2828
}
2929

3030
allprojects {
3131
repositories {
3232
google()
33-
jcenter()
33+
mavenCentral()
3434
}
3535
}
3636

@@ -39,15 +39,15 @@ task clean(type: Delete) {
3939
}
4040

4141
ext {
42-
supportLibVersion = '1.2.0'
43-
constraintLayoutVersion = '2.0.4'
44-
coreVersion = '1.3.2'
45-
coroutinesVersion = '1.4.2'
46-
materialVersion = '1.3.0'
47-
lifecycleVersion = '2.3.0'
42+
supportLibVersion = '1.3.1'
43+
constraintLayoutVersion = '2.1.0'
44+
coreVersion = '1.6.0'
45+
coroutinesVersion = '1.5.2'
46+
materialVersion = '1.4.0'
47+
lifecycleVersion = '2.3.1'
4848

49-
runnerVersion = '1.3.0'
49+
runnerVersion = '1.4.0'
5050
rulesVersion = '1.0.1'
5151
junitVersion = '4.13.1'
52-
espressoVersion = '3.3.0'
52+
espressoVersion = '3.4.0'
5353
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Feb 25 11:54:48 GMT 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)