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.

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

Update deps, gradle and target SDK 34 #1120

Merged
merged 5 commits into from
Aug 2, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
23 changes: 14 additions & 9 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ plugins {
apply(from = "update_instances.gradle.kts")

android {
compileSdk = 33
compileSdk = 34

defaultConfig {
applicationId = "com.jerboa"
namespace = "com.jerboa"
minSdk = 26
targetSdk = 33
targetSdk = 34
versionCode = 41
versionName = "0.0.41"

Expand Down Expand Up @@ -99,8 +99,6 @@ android {
}

dependencies {
val composeVersion = "1.5.0-beta03"

implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.github.alorma:compose-settings-ui-m3:0.27.0")

Expand Down Expand Up @@ -154,29 +152,36 @@ dependencies {
// Unfortunately, ui tooling, and the markdown thing, still brings in the other material2 dependencies
implementation("androidx.compose.material3:material3:1.1.1")
implementation("androidx.compose.material3:material3-window-size-class:1.1.1")
implementation("androidx.compose.material:material-icons-extended:$composeVersion")

implementation("org.ocpsoft.prettytime:prettytime:5.0.6.Final")
implementation("io.coil-kt:coil-compose:2.4.0")
implementation("androidx.navigation:navigation-compose:2.7.0-beta01")
implementation("androidx.navigation:navigation-compose:2.7.0-rc01")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1")
testImplementation("androidx.arch.core:core-testing:2.2.0")
implementation("com.squareup.retrofit2:retrofit:2.9.0")
implementation("com.squareup.retrofit2:converter-gson:2.9.0")

val composeVersion = "1.5.0-rc01"
implementation("androidx.compose.ui:ui:$composeVersion")
implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion")
androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
debugImplementation("androidx.compose.ui:ui-test-manifest:$composeVersion")
implementation("androidx.compose.material:material-icons-extended:$composeVersion")

implementation("androidx.activity:activity-compose:1.7.2")
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:$composeVersion")
debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
debugImplementation("androidx.compose.ui:ui-test-manifest:$composeVersion")

implementation("net.engawapg.lib:zoomable:1.4.3")
implementation("androidx.browser:browser:1.5.0")

implementation("androidx.profileinstaller:profileinstaller:1.3.1")
baselineProfile(project(":benchmarks"))

implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
implementation("me.saket.swipe:swipe:1.2.0")


}
2 changes: 1 addition & 1 deletion benchmarks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ android {
}

defaultConfig {
testInstrumentationRunnerArguments += mapOf("suppressErrors" to "EMULATOR")
minSdk = 26
targetSdk = 33

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
// Only use the emulator to test benchmarks
testInstrumentationRunnerArguments += mapOf("androidx.benchmark.suppressErrors" to "EMULATOR")
}

targetProjectPath = ":app"
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ buildscript {
}// Top-level build file where you can add configuration options common to all sub-projects/modules.

plugins {
id("com.android.application") version "8.0.2" apply false
id("com.android.library") version "8.0.2" apply false
id("com.android.application") version "8.1.0" apply false
id("com.android.library") version "8.1.0" 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.15.0" apply false
id("com.google.devtools.ksp") version "1.8.21-1.0.11" apply false
id( "com.android.test") version "8.0.2" apply false
id( "com.android.test") version "8.1.0" apply false
id( "androidx.baselineprofile") version "1.2.0-alpha13" apply false
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=a62c5f99585dd9e1f95dab7b9415a0e698fa9dd1e6c38537faa81ac078f4d23e
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists