Private
Public Access
1
0

Upgrade project and dependencies

This commit is contained in:
2023-08-07 19:35:42 -07:00
parent 2e9b62b654
commit 203e1c5ed9
4 changed files with 20 additions and 21 deletions

View File

@@ -37,7 +37,7 @@ android {
compose true compose true
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion '1.4.1' kotlinCompilerExtensionVersion '1.5.0'
} }
packagingOptions { packagingOptions {
resources { resources {
@@ -48,13 +48,13 @@ android {
dependencies { dependencies {
implementation 'androidx.compose.material3:material3:1.1.1' implementation 'androidx.compose.material3:material3:1.1.1'
implementation 'androidx.core:core-ktx:+' implementation 'androidx.core:core-ktx:1.10.1'
// Kordophone lib // Kordophone lib
implementation project(':backend') implementation project(':backend')
// Navigation // Navigation
def nav_version = "2.5.3" def nav_version = "2.6.0"
// Java language implementation // Java language implementation
implementation "androidx.navigation:navigation-fragment:$nav_version" implementation "androidx.navigation:navigation-fragment:$nav_version"
@@ -73,15 +73,12 @@ dependencies {
// Jetpack Compose Integration // Jetpack Compose Integration
implementation "androidx.navigation:navigation-compose:$nav_version" implementation "androidx.navigation:navigation-compose:$nav_version"
implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
implementation 'androidx.activity:activity-compose:1.3.1' implementation 'androidx.activity:activity-compose:1.4.0'
implementation "androidx.compose.ui:ui:$compose_ui_version" implementation "androidx.compose.ui:ui:1.4.3"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version" implementation "androidx.compose.ui:ui-tooling-preview:1.4.3"
implementation 'androidx.compose.material:material:1.1.1' implementation 'androidx.compose.material:material:1.4.3'
implementation "androidx.compose.foundation:foundation:$compose_ui_version" implementation "androidx.compose.foundation:foundation:1.4.3"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
} }

View File

@@ -32,13 +32,14 @@ android {
dependencies { dependencies {
implementation 'androidx.core:core-ktx:1.8.0' implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.5.0' implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.core:core-ktx:+' implementation 'androidx.core:core-ktx:1.10.1'
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
// Third-party // Third-party
implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:retrofit:2.9.0'

View File

@@ -0,0 +1,2 @@
package net.buzzert.kordophone.backend

View File

@@ -1,12 +1,11 @@
buildscript { buildscript {
ext { ext {
compose_ui_version = '1.4.1'
} }
} }
// 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.
plugins { plugins {
id 'com.android.application' version '7.4.2' apply false id 'com.android.application' version '8.0.2' apply false
id 'com.android.library' version '7.4.2' apply false id 'com.android.library' version '8.0.2' apply false
id 'org.jetbrains.kotlin.android' version '1.9.0' apply false id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
} }