Skip to content

Commit

Permalink
make project compile again and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
diasDominik committed Aug 27, 2024
1 parent 52d1bff commit a51e076
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 63 deletions.
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ plugins {
alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.jetbrainsKotlinAndroid) apply false
alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.compose.compiler) apply false
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package de.dominikdias.database.data

import androidx.annotation.Keep
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey

@Keep
data class Duration(val duration: Long)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package de.dominikdias.database.factory

import android.content.Context
import androidx.annotation.Keep
import de.dominikdias.database.DurationDatabase
import de.dominikdias.database.interfaces.IDurationRepository
import de.dominikdias.database.repository.DurationRepositoryImpl

@Keep
object DurationRepositoryProvider {
fun provideDatabaseRepository(context: Context): IDurationRepository {
return DurationRepositoryImpl(DurationDatabase.getDatabase(context = context).durationDao())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package de.dominikdias.database.interfaces

import androidx.annotation.Keep
import de.dominikdias.database.data.Duration
import kotlinx.coroutines.flow.Flow

@Keep
interface IDurationRepository {
suspend fun insertDuration(duration: Duration)
suspend fun getAllDurations(): Flow<List<Duration>>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package de.dominikdias.database.viewmodel

import androidx.annotation.Keep
import androidx.compose.runtime.Stable
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
Expand All @@ -13,6 +14,7 @@ import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch

@Keep
class DatabaseViewModel(private val durationRepository: IDurationRepository): ViewModel() {

private var _durationList = MutableStateFlow<List<Duration>>(emptyList())
Expand All @@ -34,6 +36,7 @@ class DatabaseViewModel(private val durationRepository: IDurationRepository): Vi
}
}

@Keep
companion object {
fun factory(durationRepository: IDurationRepository): ViewModelProvider.Factory = viewModelFactory {
initializer {
Expand Down

This file was deleted.

22 changes: 10 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
[versions]
activityCompose = "1.9.1"
agp = "8.5.1"
agp = "8.5.2"
androidx-room = "2.6.1"
composeBom = "2024.06.00"
composeCompiler = "1.5.14"
composeBom = "2024.08.00"
composeFoundation = "1.3.1"
composeMaterial = "1.3.1"
constraintlayout = "2.1.4"
coreKtx = "1.13.1"
coreSplashscreen = "1.0.1"
espressoCore = "3.5.1"
google-ksp = "2.0.0-1.0.24"
espressoCore = "3.6.1"
google-ksp = "2.0.20-1.0.24"
horologistComposeTools = "0.6.9"
horologistTiles = "0.6.11"
junit = "4.13.2"
junitVersion = "1.1.5"
kotlin = "2.0.0"
junitVersion = "1.2.1"
kotlin = "2.0.20"
kotlinxCollectionsImmutable = "0.3.7"
lifecycleViewmodelCompose = "2.8.4"
material3 = "1.2.1"
navigation-compose = "2.7.7"
playServicesWearable = "18.1.0"
tiles = "1.3.0"
tilesMaterial = "1.3.0"
playServicesWearable = "18.2.0"
tiles = "1.4.0"
tilesMaterial = "1.4.0"
watchfaceComplicationsDataSourceKtx = "1.2.1"
wear-tooling-preview = "1.0.0"
java-jdk = "17"
Expand All @@ -33,7 +32,6 @@ androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", versi
androidx-compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "composeFoundation" }
androidx-compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "composeMaterial" }
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "composeCompiler" }
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "coreSplashscreen" }
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
Expand Down Expand Up @@ -64,4 +62,4 @@ androidApplication = { id = "com.android.application", version.ref = "agp" }
androidLibrary = { id = "com.android.library", version.ref = "agp" }
com-google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "google-ksp" }
jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions mobile/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.jetbrainsKotlinAndroid)
alias(libs.plugins.compose.compiler)
}

android {
Expand All @@ -19,8 +20,6 @@ android {

buildFeatures.compose = true

composeOptions.kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()

kotlin.jvmToolchain(libs.versions.java.jdk.get().toInt())

buildTypes {
Expand Down
1 change: 0 additions & 1 deletion mobile/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.GymRestTimer"
tools:targetApi="31">
<activity
android:name=".activity.MainActivity"
Expand Down
5 changes: 0 additions & 5 deletions mobile/src/main/res/values/themes.xml

This file was deleted.

2 changes: 1 addition & 1 deletion wear/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.jetbrainsKotlinAndroid)
alias(libs.plugins.compose.compiler)
}

android {
Expand All @@ -20,7 +21,6 @@ android {

kotlin.jvmToolchain(libs.versions.java.jdk.get().toInt())
buildFeatures.compose = true
composeOptions.kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()

buildTypes {
release {
Expand Down

0 comments on commit a51e076

Please sign in to comment.