Skip to content

Commit d98b5e2

Browse files
committed
Merge branch 'next' into feature/storacha-next
# Conflicts: # gradle/libs.versions.toml
2 parents 5eae3f4 + 05538d0 commit d98b5e2

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

app/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ android {
5858
applicationId = "net.opendasharchive.openarchive"
5959
minSdk = 29
6060
targetSdk = 36
61-
versionCode = 30017
61+
versionCode = 30018
6262
versionName = "4.0.2"
6363
multiDexEnabled = true
6464
vectorDrawables.useSupportLibrary = true
@@ -95,16 +95,19 @@ android {
9595
flavorDimensions += "env"
9696

9797
productFlavors {
98+
9899
create("dev") {
99100
dimension = "env"
100101
versionNameSuffix = "-dev"
101102
applicationIdSuffix = ".debug"
102103
}
104+
103105
create("staging") {
104106
dimension = "env"
105107
versionNameSuffix = "-staging"
106108
applicationIdSuffix = ".debug"
107109
}
110+
108111
create("prod") {
109112
dimension = "env"
110113
applicationIdSuffix = ".release"

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[versions]
2-
activity = "1.10.1"
2+
activity = "1.11.0"
33
agp = "8.13.0"
44
appcompat = "1.7.1"
55
biometric = "1.1.0"
66
coil = "3.3.0"
7-
compose = "1.9.0"
7+
compose = "1.9.1"
88
compose-material-icons = "1.7.8"
99
compose-preference = "1.1.1"
1010
constraintlayout = "2.2.1"
@@ -29,12 +29,12 @@ junit-android = "1.3.0"
2929
androidx-test-runner = "1.7.0"
3030
koin = "4.1.1"
3131
kotlin = "2.2.20"
32-
ksp = "2.2.10-2.0.2"
32+
ksp = "2.2.20-2.0.2"
3333
lifecycle = "2.9.3"
3434
material = "1.13.0"
35-
material3 = "1.4.0-beta03"
35+
material3 = "1.4.0-rc01"
3636
mixpanel = "8.2.2"
37-
navigation = "2.9.3"
37+
navigation = "2.9.4"
3838
#noinspection NewerVersionAvailable
3939
okhttp = "4.12.0" # Cannot update to 5.x.x due to sardine client (com.github.guardianproject)
4040
preference = "1.2.1"

0 commit comments

Comments
 (0)