yetangitu/opentimelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/opentimelimit-android.git synced 2025-10-03 17:59:46 +02:00
Code Issues Projects Releases Wiki Activity

Update buildtools and dependencies

Browse source
This commit is contained in:
Jonas Lochmann 2022-09-12 02:00:00 +02:00
parent 381bd2b9ae
commit a5102207f2
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/build.gradle
View file

@ -77,18 +77,18 @@ android {
} }
dependencies { dependencies {
def nav_version = "2.5.0" def nav_version = "2.5.2"
def room_version = "2.4.2" def room_version = "2.4.3"
def paging_version = "3.1.1" def paging_version = "3.1.1"
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.core:core:1.8.0' implementation 'androidx.core:core:1.9.0'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation "com.google.android.material:material:1.6.1" 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-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui:$nav_version" implementation "androidx.navigation:navigation-ui:$nav_version"
@ -102,7 +102,7 @@ dependencies {
implementation "androidx.paging:paging-runtime:$paging_version" implementation "androidx.paging:paging-runtime:$paging_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2' 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' implementation 'androidx.biometric:biometric:1.1.0'

10
app/src/main/java/io/timelimit/android/ui/user/create/DefaultCategories.kt
View file

@ -79,7 +79,7 @@ class DefaultCategories private constructor(private val context: Context) {
id = IdGenerator.generateId(), id = IdGenerator.generateId(),
categoryId = categoryId, categoryId = categoryId,
applyToExtraTimeUsage = false, 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 maximumTimeInMillis = 1000 * 60 * 60 * 6, // 6 hours
startMinuteOfDay = TimeLimitRule.MIN_START_MINUTE, startMinuteOfDay = TimeLimitRule.MIN_START_MINUTE,
endMinuteOfDay = TimeLimitRule.MAX_END_MINUTE, endMinuteOfDay = TimeLimitRule.MAX_END_MINUTE,
@ -95,7 +95,7 @@ class DefaultCategories private constructor(private val context: Context) {
id = IdGenerator.generateId(), id = IdGenerator.generateId(),
categoryId = categoryId, categoryId = categoryId,
applyToExtraTimeUsage = true, applyToExtraTimeUsage = true,
dayMask = 1 + 2 + 4 + 8 + 16, dayMask = (1 + 2 + 4 + 8 + 16).toByte(),
maximumTimeInMillis = 0, maximumTimeInMillis = 0,
startMinuteOfDay = 0, startMinuteOfDay = 0,
endMinuteOfDay = 6 * 60 - 1, endMinuteOfDay = 6 * 60 - 1,
@ -110,7 +110,7 @@ class DefaultCategories private constructor(private val context: Context) {
id = IdGenerator.generateId(), id = IdGenerator.generateId(),
categoryId = categoryId, categoryId = categoryId,
applyToExtraTimeUsage = true, applyToExtraTimeUsage = true,
dayMask = 1 + 2 + 4 + 8 + 16, dayMask = (1 + 2 + 4 + 8 + 16).toByte(),
maximumTimeInMillis = 0, maximumTimeInMillis = 0,
startMinuteOfDay = 18 * 60, startMinuteOfDay = 18 * 60,
endMinuteOfDay = MinuteOfDay.MAX, endMinuteOfDay = MinuteOfDay.MAX,
@ -126,7 +126,7 @@ class DefaultCategories private constructor(private val context: Context) {
id = IdGenerator.generateId(), id = IdGenerator.generateId(),
categoryId = categoryId, categoryId = categoryId,
applyToExtraTimeUsage = true, applyToExtraTimeUsage = true,
dayMask = 32 + 64, dayMask = (32 + 64).toByte(),
maximumTimeInMillis = 0, maximumTimeInMillis = 0,
startMinuteOfDay = 0, startMinuteOfDay = 0,
endMinuteOfDay = 9 * 60 - 1, endMinuteOfDay = 9 * 60 - 1,
@ -141,7 +141,7 @@ class DefaultCategories private constructor(private val context: Context) {
id = IdGenerator.generateId(), id = IdGenerator.generateId(),
categoryId = categoryId, categoryId = categoryId,
applyToExtraTimeUsage = true, applyToExtraTimeUsage = true,
dayMask = 32 + 64, dayMask = (32 + 64).toByte(),
maximumTimeInMillis = 0, maximumTimeInMillis = 0,
startMinuteOfDay = 20 * 60, startMinuteOfDay = 20 * 60,
endMinuteOfDay = MinuteOfDay.MAX, endMinuteOfDay = MinuteOfDay.MAX,

6
build.gradle
View file

@ -18,15 +18,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.6.21' ext.kotlin_version = '1.7.10'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
} }
dependencies { 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 "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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionSha256Sum=c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879 distributionSha256Sum=cd5c2958a107ee7f0722004a12d0f8559b4564c34daad7df06cffd4d12a426d0