Skip to content

Commit f3dea60

Browse files
biozalbiozal
committed
updated CBL to 3.1.6
1 parent f24066d commit f3dea60

File tree

3 files changed

+61
-61
lines changed

3 files changed

+61
-61
lines changed

‎src/app/build.gradle.kts

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -70,87 +70,87 @@ dependencies {
7070

7171
//Gradle docs on Extra properties
7272
//https://docs.gradle.org/current/userguide/kotlin_dsl.html#extra_properties
73-
val kotlin_version:String by rootProject.extra
74-
val core_ktx:String by rootProject.extra
75-
val compose_version:String by rootProject.extra
76-
val compose_ui_version:String by rootProject.extra
77-
val activity_compose_version:String by rootProject.extra
78-
val lifecyle_runtime_ktx_version:String by rootProject.extra
79-
val koin_version:String by rootProject.extra
80-
val android_materialdesign_version:String by rootProject.extra
81-
val androidx_navigation_compose_version:String by rootProject.extra
82-
val google_accompanist_version:String by rootProject.extra
83-
val kotlinx_serialization_json:String by rootProject.extra
84-
val constraints_compose_version:String by rootProject.extra
85-
val annotation_experimental_version:String by rootProject.extra
86-
val coroutines_tests_version:String by rootProject.extra
73+
val kotlinVersion:String by rootProject.extra
74+
val coreKtx:String by rootProject.extra
75+
val composeVersion:String by rootProject.extra
76+
val composeUiVersion:String by rootProject.extra
77+
val activityComposeVersion:String by rootProject.extra
78+
val lifestyleRuntimeKtVersion:String by rootProject.extra
79+
val koinVersion:String by rootProject.extra
80+
val androidMaterialDesignVersion:String by rootProject.extra
81+
val androidxNavigationComposeVersion:String by rootProject.extra
82+
val googleAccompanistVersion:String by rootProject.extra
83+
val kotlinxSerializationJson:String by rootProject.extra
84+
val constraintsComposeVersion:String by rootProject.extra
85+
val annotationExperimentalVersion:String by rootProject.extra
86+
val coroutinesTestsVersion:String by rootProject.extra
8787

8888
//couchbase
89-
val couchbase_lite_version:String by rootProject.extra
89+
val couchbaseLiteVersion:String by rootProject.extra
9090
//core serialization
91-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_json")
91+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationJson")
9292

9393
//core compose
94-
implementation("androidx.core:core-ktx:$core_ktx")
95-
implementation("androidx.compose.ui:ui:$compose_ui_version")
94+
implementation("androidx.core:core-ktx:$coreKtx")
95+
implementation("androidx.compose.ui:ui:$composeUiVersion")
9696

9797
// Tooling support (Previews, etc.)
98-
implementation("androidx.compose.ui:ui-tooling:$compose_ui_version")
98+
implementation("androidx.compose.ui:ui-tooling:$composeUiVersion")
9999

100100
// Foundation (Border, Background, Box, Image, Scroll, shapes, animations, etc.)
101-
implementation("androidx.compose.foundation:foundation:$compose_ui_version")
102-
implementation("androidx.compose.foundation:foundation-layout:$compose_ui_version")
101+
implementation("androidx.compose.foundation:foundation:$composeUiVersion")
102+
implementation("androidx.compose.foundation:foundation-layout:$composeUiVersion")
103103

104104
// animation
105-
implementation("androidx.compose.animation:animation:$compose_ui_version")
105+
implementation("androidx.compose.animation:animation:$composeUiVersion")
106106

107107
// Material design and icons
108-
implementation("androidx.compose.material:material:$compose_ui_version")
109-
implementation("androidx.compose.material:material-icons-core:$compose_ui_version")
110-
implementation("androidx.compose.material:material-icons-extended:$compose_ui_version")
111-
implementation("com.google.android.material:material:$android_materialdesign_version")
108+
implementation("androidx.compose.material:material:$composeUiVersion")
109+
implementation("androidx.compose.material:material-icons-core:$composeUiVersion")
110+
implementation("androidx.compose.material:material-icons-extended:$composeUiVersion")
111+
implementation("com.google.android.material:material:$androidMaterialDesignVersion")
112112

113113
//lifecycle and integration with ViewModels
114-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecyle_runtime_ktx_version")
115-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecyle_runtime_ktx_version")
116-
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecyle_runtime_ktx_version")
117-
implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecyle_runtime_ktx_version")
114+
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifestyleRuntimeKtVersion")
115+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifestyleRuntimeKtVersion")
116+
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifestyleRuntimeKtVersion")
117+
implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifestyleRuntimeKtVersion")
118118

119119
// Integration with observables
120-
implementation("androidx.compose.runtime:runtime-livedata:$compose_ui_version")
120+
implementation("androidx.compose.runtime:runtime-livedata:$composeUiVersion")
121121

122122
// Integration with activities
123-
implementation("androidx.activity:activity-compose:$activity_compose_version")
123+
implementation("androidx.activity:activity-compose:$activityComposeVersion")
124124

125125
// Integration with constraints
126-
implementation("androidx.constraintlayout:constraintlayout-compose:$constraints_compose_version")
126+
implementation("androidx.constraintlayout:constraintlayout-compose:$constraintsComposeVersion")
127127

128128
// navigation
129-
implementation("androidx.navigation:navigation-compose:$androidx_navigation_compose_version")
129+
implementation("androidx.navigation:navigation-compose:$androidxNavigationComposeVersion")
130130

131131
//fix for android versions older than 9 that won't load images https://github.com/google/accompanist
132132
implementation("com.google.accompanist:accompanist-drawablepainter:0.34.0")
133133
implementation("com.google.accompanist:accompanist-insets:0.30.1")
134134

135135
// Dependency injection
136-
implementation("io.insert-koin:koin-core:$koin_version")
137-
implementation("io.insert-koin:koin-android:$koin_version")
138-
implementation("io.insert-koin:koin-androidx-compose:$koin_version")
136+
implementation("io.insert-koin:koin-core:$koinVersion")
137+
implementation("io.insert-koin:koin-android:$koinVersion")
138+
implementation("io.insert-koin:koin-androidx-compose:$koinVersion")
139139

140140
//couchbase lite for kotlin
141-
implementation("com.couchbase.lite:couchbase-lite-android-ktx:$couchbase_lite_version")
141+
implementation("com.couchbase.lite:couchbase-lite-android-ktx:3.1.6")
142142

143143
//required because some flow APIs are still experimental (Card's onclick and cblite flow)
144-
implementation("androidx.annotation:annotation-experimental:$annotation_experimental_version")
144+
implementation("androidx.annotation:annotation-experimental:$annotationExperimentalVersion")
145145

146146
testImplementation("junit:junit:4.13.2")
147147
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
148148
androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
149149
androidTestImplementation("androidx.test.ext:junit:1.1.5")
150150
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
151-
androidTestImplementation("androidx.compose.ui:ui-test-junit4:$compose_ui_version")
151+
androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeUiVersion")
152152
androidTestImplementation("androidx.test:runner:1.5.2")
153153
androidTestUtil("androidx.test:orchestrator:1.4.2")
154-
debugImplementation("androidx.compose.ui:ui-tooling:$compose_ui_version")
155-
debugImplementation("androidx.compose.ui:ui-test-manifest:$compose_ui_version")
154+
debugImplementation("androidx.compose.ui:ui-tooling:$composeUiVersion")
155+
debugImplementation("androidx.compose.ui:ui-test-manifest:$composeUiVersion")
156156
}

‎src/build.gradle.kts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
buildscript {
22
//Gradle docs on Extra properties
33
//https://docs.gradle.org/current/userguide/kotlin_dsl.html#extra_properties
4-
val kotlin_version by extra("1.9.22")
5-
val core_ktx by extra("1.12.0")
6-
val compose_version by extra("1.3.1")
7-
val compose_ui_version by extra("1.6.1")
8-
val activity_compose_version by extra("1.8.2")
9-
val lifecyle_runtime_ktx_version by extra("2.7.0")
10-
val koin_version by extra("3.5.3")
11-
val android_materialdesign_version by extra("1.11.0")
12-
val androidx_navigation_compose_version by extra("2.5.0")
13-
val google_accompanist_version by extra("0.23.1")
14-
val kotlinx_serialization_json by extra("1.6.2")
15-
val constraints_compose_version by extra("1.0.1")
16-
val annotation_experimental_version by extra("1.4.0")
17-
val coroutines_tests_version by extra("1.6.3")
4+
val kotlinVersion by extra("1.9.22")
5+
val coreKtx by extra("1.12.0")
6+
val composeVersion by extra("1.3.1")
7+
val composeUiVersion by extra("1.6.1")
8+
val activityComposeVersion by extra("1.8.2")
9+
val lifestyleRuntimeKtVersion by extra("2.7.0")
10+
val koinVersion by extra("3.5.3")
11+
val androidMaterialDesignVersion by extra("1.11.0")
12+
val androidxNavigationComposeVersion by extra("2.5.0")
13+
val googleAccompanistVersion by extra("0.23.1")
14+
val kotlinxSerializationJson by extra("1.6.2")
15+
val constraintsComposeVersion by extra("1.0.1")
16+
val annotationExperimentalVersion by extra("1.4.0")
17+
val coroutinesTestsVersion by extra("1.6.3")
1818

1919
//couchbase
20-
val couchbase_lite_version by extra("3.1.3")
20+
val couchbaseLiteVersion by extra("3.1.3")
2121

2222

2323
repositories {
@@ -26,13 +26,13 @@ buildscript {
2626
mavenCentral()
2727
}
2828
dependencies {
29-
classpath("org.jetbrains.kotlin:kotlin-serialization:${kotlin_version}")
29+
classpath("org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}")
3030
}
3131
} // Top-level build file where you can add configuration options common to all sub-projects/modules.
3232

3333
plugins {
34-
id("com.android.application") version "8.2.2" apply false
35-
id("com.android.library") version "8.2.2" apply false
34+
id("com.android.application") version "8.3.0" apply false
35+
id("com.android.library") version "8.3.0" apply false
3636
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
3737
id("org.jetbrains.kotlin.jvm") version "1.9.22" apply false
3838
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22"

‎src/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Apr 15 09:52:37 EDT 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)