diff --git a/app/build.gradle b/app/build.gradle index 8dd66e0..4ee0608 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,18 +77,18 @@ android { } dependencies { - def nav_version = "2.5.0" - def room_version = "2.4.2" + def nav_version = "2.5.2" + def room_version = "2.4.3" def paging_version = "3.1.1" implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.4.2' - implementation 'androidx.core:core:1.8.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.core:core:1.9.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation "com.google.android.material:material:1.6.1" - implementation 'androidx.fragment:fragment-ktx:1.5.0' + implementation 'androidx.fragment:fragment-ktx:1.5.2' implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-ui:$nav_version" @@ -102,7 +102,7 @@ dependencies { implementation "androidx.paging:paging-runtime:$paging_version" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1' implementation 'androidx.biometric:biometric:1.1.0' diff --git a/app/src/main/java/io/timelimit/android/ui/user/create/DefaultCategories.kt b/app/src/main/java/io/timelimit/android/ui/user/create/DefaultCategories.kt index 2f4e227..79c19cc 100644 --- a/app/src/main/java/io/timelimit/android/ui/user/create/DefaultCategories.kt +++ b/app/src/main/java/io/timelimit/android/ui/user/create/DefaultCategories.kt @@ -79,7 +79,7 @@ class DefaultCategories private constructor(private val context: Context) { id = IdGenerator.generateId(), categoryId = categoryId, applyToExtraTimeUsage = false, - dayMask = 1 + 2 + 4 + 8 + 16 + 32 + 64, + dayMask = (1 + 2 + 4 + 8 + 16 + 32 + 64).toByte(), maximumTimeInMillis = 1000 * 60 * 60 * 6, // 6 hours startMinuteOfDay = TimeLimitRule.MIN_START_MINUTE, endMinuteOfDay = TimeLimitRule.MAX_END_MINUTE, @@ -95,7 +95,7 @@ class DefaultCategories private constructor(private val context: Context) { id = IdGenerator.generateId(), categoryId = categoryId, applyToExtraTimeUsage = true, - dayMask = 1 + 2 + 4 + 8 + 16, + dayMask = (1 + 2 + 4 + 8 + 16).toByte(), maximumTimeInMillis = 0, startMinuteOfDay = 0, endMinuteOfDay = 6 * 60 - 1, @@ -110,7 +110,7 @@ class DefaultCategories private constructor(private val context: Context) { id = IdGenerator.generateId(), categoryId = categoryId, applyToExtraTimeUsage = true, - dayMask = 1 + 2 + 4 + 8 + 16, + dayMask = (1 + 2 + 4 + 8 + 16).toByte(), maximumTimeInMillis = 0, startMinuteOfDay = 18 * 60, endMinuteOfDay = MinuteOfDay.MAX, @@ -126,7 +126,7 @@ class DefaultCategories private constructor(private val context: Context) { id = IdGenerator.generateId(), categoryId = categoryId, applyToExtraTimeUsage = true, - dayMask = 32 + 64, + dayMask = (32 + 64).toByte(), maximumTimeInMillis = 0, startMinuteOfDay = 0, endMinuteOfDay = 9 * 60 - 1, @@ -141,7 +141,7 @@ class DefaultCategories private constructor(private val context: Context) { id = IdGenerator.generateId(), categoryId = categoryId, applyToExtraTimeUsage = true, - dayMask = 32 + 64, + dayMask = (32 + 64).toByte(), maximumTimeInMillis = 0, startMinuteOfDay = 20 * 60, endMinuteOfDay = MinuteOfDay.MAX, diff --git a/build.gradle b/build.gradle index d1e79e8..c0d3d67 100644 --- a/build.gradle +++ b/build.gradle @@ -18,15 +18,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.6.21' + ext.kotlin_version = '1.7.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.4.2' + classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 83070a0..38706c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip -distributionSha256Sum=c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879 \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionSha256Sum=cd5c2958a107ee7f0722004a12d0f8559b4564c34daad7df06cffd4d12a426d0 \ No newline at end of file