Skip to content

Commit

Permalink
versions bumped and some cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
alisen committed Oct 12, 2023
1 parent 554bf39 commit 7d43eae
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 160 deletions.
2 changes: 1 addition & 1 deletion zeapp/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
.externalNativeBuild
.cxx
local.properties
versions.properties
versions.properties!/versions.properties
1 change: 0 additions & 1 deletion zeapp/android/.gitignore

This file was deleted.

126 changes: 5 additions & 121 deletions zeapp/android/detekt-baseline.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion zeapp/android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true"
android:theme="@style/Theme.ZeBadgeApp"
tools:targetApi="31">
tools:targetApi="34">
<profileable android:shell="true" />

<activity
Expand Down
1 change: 0 additions & 1 deletion zeapp/benchmark/.gitignore

This file was deleted.

14 changes: 7 additions & 7 deletions zeapp/benchmark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {
}

defaultConfig {
minSdk = 24
minSdk = 29
targetSdk = 34

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -36,9 +36,9 @@ android {
}

testOptions.managedDevices.devices {
create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel6Api31") {
create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel6Api34") {
device = "Pixel 6"
apiLevel = 31
apiLevel = 34
systemImageSource = "aosp"
}
}
Expand All @@ -48,14 +48,14 @@ android {
}

dependencies {
implementation("androidx.test.ext:junit:1.1.5")
implementation("androidx.test.uiautomator:uiautomator:2.2.0")
implementation("androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha16")
implementation(libs.androidx.test.ext.junit)
implementation(libs.androidx.uiautomator)
implementation(libs.androidx.benchmark.macro.junit4)
}

baselineProfile {

// This specifies the managed devices to use that you run the tests on. The
// default is none.
managedDevices += "pixel6Api31"
managedDevices += "pixel6Api34"
}
2 changes: 1 addition & 1 deletion zeapp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
alias(libs.plugins.firebase.crashlytics) apply false
alias(libs.plugins.license.report.gradle) apply false
id("com.android.test") version "8.0.2" apply false
kotlin("multiplatform").version("1.8.21").apply(false)
kotlin("multiplatform").version("1.9.10").apply(false)
}

tasks.register("clean", Delete::class) {
Expand Down
4 changes: 2 additions & 2 deletions zeapp/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ android.nonTransitiveRClass=true
kotlin.mpp.enableCInteropCommonization=true
kotlin.mpp.androidSourceSetLayoutVersion=2

kotlin.version=1.9.0
compose.version=1.4.3
kotlin.version=1.9.10
compose.version=1.5.3
49 changes: 26 additions & 23 deletions zeapp/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,40 +17,43 @@ license-report-gradle = { id = "com.jaredsburrows.license", version.ref = "licen

[versions]

android-gradle-plugin = "8.1.1"
androidx-activity = "1.7.2"
androidx-compose-bom = "2023.08.00"
androidx-compose-compiler = "1.5.2"
androidx-core = "1.10.1"
android-gradle-plugin = "8.1.2"
androidx-activity = "1.8.0"
androidx-compose-bom = "2023.10.00"
androidx-compose-compiler = "1.5.3"
androidx-core = "1.12.0"
androidx-datastore = "1.0.0"
androidx-lifecycle = "2.6.1"
androidx-lifecycle = "2.6.2"
androidx-test-ext-junit = "1.1.5"
appcompat = "1.6.1"
benchmark = "1.2.0-alpha16"
core-ktx = "1.10.1"
dagger-hilt = "2.46.1"
detekt-gradle = "1.23.0"
benchmarkMacroJunit4 = "1.2.0-rc02"
core-ktx = "1.12.0"
dagger-hilt = "2.48.1"
detekt-gradle = "1.23.1"
espresso-core = "3.5.1"
firebase = "32.2.3"
firebase = "32.3.1"
firebase-appdistribution = "4.0.0"
firebase-crashlytics = "2.9.6"
google-play-services = "4.3.15"
firebase-crashlytics = "2.9.9"
google-play-services = "4.4.0"
jSerialComm = "2.10.3"
junit = "4.13.2"
kotlin = "1.9.0"
kotlin = "1.9.10"
kotlinx-coroutines-core = "1.7.3"
ktlint-gradle = "11.5.0"
ktlint-gradle = "11.6.1"
license-report-gradle = "0.9.3"
material = "1.9.0"
material3-wsc = "1.1.1"
mik3y-usb-serial = "3.5.1"
material = "1.10.0"
material3-wsc = "1.1.2"
mik3y-usb-serial = "3.6.0"
retrofit = "2.9.0"
timber = "5.0.1"
zxing ="3.5.1"
uiautomator = "2.2.0"
zxing ="3.5.2"

[libraries]

androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmarkMacroJunit4" }
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
Expand All @@ -62,6 +65,7 @@ androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx
androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiautomator" }
appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
coil-compose = "io.coil-kt:coil-compose:2.4.0"
coil-transformations = "com.github.Commit451.coil-transformations:transformations:2.0.2"
Expand All @@ -83,10 +87,9 @@ retrofit2-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref =
timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
zxing = { module = "com.google.zxing:core", version.ref = "zxing" }


test-assertk = "com.willowtreeapps.assertk:assertk-jvm:0.26.1"
test-assertk = "com.willowtreeapps.assertk:assertk-jvm:0.27.0"
test-junit = "junit:junit:4.13.2"
test-compose-junit = "androidx.compose.ui:ui-test-junit4:1.5.0"
test-compose-manifest = "androidx.compose.ui:ui-test-manifest:1.5.0"
test-mockk = "io.mockk:mockk:1.13.5"
test-compose-junit = "androidx.compose.ui:ui-test-junit4:1.5.3"
test-compose-manifest = "androidx.compose.ui:ui-test-manifest:1.5.3"
test-mockk = "io.mockk:mockk:1.13.8"
test-coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3"
2 changes: 1 addition & 1 deletion zeapp/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.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion zeapp/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pluginManagement {

plugins {
// See https://jmfayard.github.io/refreshVersions
id("de.fayard.refreshVersions") version "0.51.0"
id("de.fayard.refreshVersions") version "0.60.3"
}

refreshVersions {
Expand Down

0 comments on commit 7d43eae

Please sign in to comment.