Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrading deps. #359

Merged
merged 1 commit into from
Apr 25, 2023
Merged

Upgrading deps. #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.4'
kotlinCompilerExtensionVersion '1.4.6'
}
}

dependencies {
implementation 'com.github.alorma:compose-settings-ui-m3:0.25.0'
implementation 'com.github.alorma:compose-settings-ui-m3:0.26.0'

implementation 'com.github.jeziellago:compose-markdown:0.3.1'

Expand All @@ -77,29 +77,29 @@ dependencies {
implementation "com.google.accompanist:accompanist-flowlayout:0.28.0"

// LiveData
implementation "androidx.compose.runtime:runtime-livedata:1.4.0"
implementation "androidx.compose.runtime:runtime-livedata:1.4.2"
implementation "androidx.lifecycle:lifecycle-runtime-compose:2.6.1"

// To use Kotlin annotation processing tool
ksp "androidx.room:room-compiler:2.5.0"
ksp "androidx.room:room-compiler:2.5.1"

implementation "androidx.room:room-runtime:2.5.0"
annotationProcessor "androidx.room:room-compiler:2.5.0"
implementation "androidx.room:room-runtime:2.5.1"
annotationProcessor "androidx.room:room-compiler:2.5.1"

// optional - Kotlin Extensions and Coroutines support for Room
implementation "androidx.room:room-ktx:2.5.0"
implementation "androidx.room:room-ktx:2.5.1"

// optional - Test helpers
testImplementation "androidx.room:room-testing:2.5.0"
testImplementation "androidx.room:room-testing:2.5.1"

// optional - Paging 3 Integration
implementation "androidx.room:room-paging:2.5.0"
implementation "androidx.room:room-paging:2.5.1"

implementation "io.arrow-kt:arrow-core:1.0.1"
// Unfortunately, ui tooling, and the markdown thing, still brings in the other material2 dependencies
implementation "androidx.compose.material3:material3:1.0.1"
implementation "androidx.compose.material3:material3-window-size-class:1.0.1"
implementation "androidx.compose.material:material-icons-extended:1.4.0"
implementation "androidx.compose.material:material-icons-extended:1.4.2"
implementation 'org.ocpsoft.prettytime:prettytime:5.0.3.Final'
implementation 'io.coil-kt:coil-compose:2.2.1'
implementation "androidx.navigation:navigation-compose:2.5.3"
Expand All @@ -108,13 +108,13 @@ dependencies {
implementation "com.squareup.retrofit2:retrofit:2.9.0"
implementation "com.squareup.retrofit2:converter-gson:2.9.0"
// implementation 'androidx.core:core-ktx:1.9.0'
implementation "androidx.compose.ui:ui:1.4.0"
implementation "androidx.compose.ui:ui-tooling-preview:1.4.0"
implementation 'androidx.activity:activity-compose:1.7.0'
implementation "androidx.compose.ui:ui:1.4.2"
implementation "androidx.compose.ui:ui-tooling-preview:1.4.2"
implementation 'androidx.activity:activity-compose:1.7.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.4.0"
debugImplementation "androidx.compose.ui:ui-tooling:1.4.0"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.4.0"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.4.2"
debugImplementation "androidx.compose.ui:ui-tooling:1.4.2"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.4.2"
}
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ buildscript {
}// Top-level build file where you can add configuration options common to all sub-projects/modules.

plugins {
id 'com.android.application' version '8.1.0-alpha10' apply false
id 'com.android.library' version '8.1.0-alpha10' apply false
id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
id 'com.android.application' version '8.1.0-alpha11' apply false
id 'com.android.library' version '8.1.0-alpha11' apply false
id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
id "com.github.ben-manes.versions" version "0.42.0"
id 'org.jmailen.kotlinter' version "3.13.0" apply false
id 'com.google.devtools.ksp' version "1.8.10-1.0.9" apply false
id 'com.google.devtools.ksp' version "1.8.20-1.0.11" apply false
}

subprojects {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Sat Jan 01 13:02:52 EST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionSha256Sum=a62c5f99585dd9e1f95dab7b9415a0e698fa9dd1e6c38537faa81ac078f4d23e
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading