Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
amandeepg committed Nov 2, 2024
1 parent 9decf52 commit e43472c
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 38 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<span><picture><img src="images/play_store_512_rounded.webp" width="256" alt="Logo icon"/></picture> &nbsp;&nbsp;
./gra<span><picture><img src="images/play_store_512_rounded.webp" width="256" alt="Logo icon"/></picture> &nbsp;&nbsp;
<a href='https://play.google.com/store/apps/details?id=ca.amandeep.path&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='images/play_store_qr_code.webp' height="256"/></a> &nbsp;

# Under The Hudson
Expand Down
22 changes: 10 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id 'app.cash.licensee'
id 'app.cash.paparazzi'
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'com.google.devtools.ksp'
id 'kotlin-parcelize'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.compose'
id 'org.jmailen.kotlinter'
id 'com.google.devtools.ksp'
id 'app.cash.licensee'
id 'app.cash.paparazzi'
}

android {
compileSdk 34
compileSdk 35

defaultConfig {
applicationId "ca.amandeep.path"
Expand Down Expand Up @@ -43,7 +44,7 @@ android {
}
kotlinOptions {
jvmTarget = '11'
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
freeCompilerArgs += "-P"
//noinspection GrDeprecatedAPIUsage
freeCompilerArgs += "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" + project.buildDir.absolutePath + "/compose_compiler"
Expand All @@ -55,9 +56,6 @@ android {
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion compose_version
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
Expand Down Expand Up @@ -88,19 +86,19 @@ tasks.withType(KotlinCompile) {
}

dependencies {
implementation(KotlinX.collections.immutable)
implementation AndroidX.activity.compose
implementation AndroidX.compose.material
implementation AndroidX.compose.material.icons.extended
implementation AndroidX.compose.material3
implementation AndroidX.compose.material3.windowSizeClass
implementation AndroidX.compose.material
implementation AndroidX.compose.ui
implementation AndroidX.core.ktx
implementation AndroidX.core.splashscreen
implementation AndroidX.lifecycle.runtime.compose
implementation AndroidX.lifecycle.runtime.ktx
implementation AndroidX.lifecycle.viewModelKtx
implementation AndroidX.navigation.compose
implementation AndroidX.compose.material.icons.extended
implementation KotlinX.collections.immutable

//noinspection GradleDependency breaking permissions changes, TODO handle them
implementation Google.accompanist.permissions
Expand Down
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ buildscript {

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'app.cash.licensee' apply false
id 'app.cash.paparazzi' apply false
id 'com.android.application' apply false
id 'com.android.library' apply false
id 'org.jetbrains.kotlin.android' apply false
id 'org.jetbrains.kotlin.plugin.compose' apply false
id 'org.jmailen.kotlinter' apply false
id 'app.cash.licensee' apply false
id 'app.cash.paparazzi' apply false
}

tasks.register('clean') {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
47 changes: 25 additions & 22 deletions versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,28 @@
####
#### NOTE: Some versions are filtered by the rejectVersionIf predicate. See the settings.gradle.kts file.

plugin.app.cash.licensee=1.11.0
plugin.app.cash.licensee=1.12.0

plugin.app.cash.paparazzi=1.3.1-thumbnail-scale-5
## # available=1.3.2
## # available=1.3.3
## # available=1.3.4

version.app.cash.licensee=1.11.0
version.app.cash.licensee=1.12.0

plugin.org.jmailen.kotlinter=4.3.0
## # available=4.4.0
## # available=4.4.1

version.junit.junit=4.13.2

version.com.google.truth.extensions..truth-java8-extension=1.4.2
version.com.google.truth.extensions..truth-java8-extension=1.4.4

version.com.google.truth..truth=1.4.2
version.com.google.truth..truth=1.4.4

version.kotlinx.collections.immutable=0.3.7
version.kotlinx.collections.immutable=0.3.8

version.org.jsoup..jsoup=1.17.2
version.org.jsoup..jsoup=1.18.1

version.retrofit2=2.11.0

Expand All @@ -36,14 +39,13 @@ version.org.jacoco..org.jacoco.ant=0.8.8

version.moshi=1.15.1

version.kotlin=1.9.23
## # available=1.9.24
version.kotlin=2.0.21

version.jakewharton.timber=5.0.1

version.io.nlopez.compose.rules..ktlint=0.3.20
version.io.nlopez.compose.rules..ktlint=0.4.17

version.google.android.play-services-location=21.2.0
version.google.android.play-services-location=21.3.0

version.google.accompanist=0.24.1-alpha
## # available=0.25.0
Expand All @@ -55,31 +57,32 @@ version.google.accompanist=0.24.1-alpha
## # available=0.30.1
## # available=0.32.0
## # available=0.34.0
## # available=0.36.0

version.dev.burnoo..compose-remember-preference=1.0.2
version.dev.burnoo..compose-remember-preference=1.1.0

version.com.github.ajalt..timberkt=1.5.1

version.androidx.navigation=2.7.7
version.androidx.navigation=2.8.3

version.androidx.lifecycle=2.7.0
version.androidx.lifecycle=2.8.7

version.androidx.core-splashscreen=1.0.1

version.androidx.core=1.13.1
version.androidx.core=1.15.0

version.androidx.compose.ui=1.6.7
version.androidx.compose.ui=1.7.5

version.androidx.compose.material3=1.2.1
version.androidx.compose.material3=1.3.1

version.androidx.compose.material=1.6.7
version.androidx.compose.material=1.7.5

version.androidx.compose.compiler=1.5.13
## unused
version.androidx.compose.compiler=1.5.15

version.androidx.activity=1.9.0
version.androidx.activity=1.9.3

plugin.com.google.devtools.ksp=1.9.23-1.0.20
## # available=1.9.24-1.0.20
plugin.com.google.devtools.ksp=2.0.21-1.0.26

## unused
plugin.android=8.4.0
plugin.android=8.7.2

0 comments on commit e43472c

Please sign in to comment.