Skip to content

Commit 0ef856d

Browse files
authored
Merge pull request #14 from QuickBlox/rc-0.10.0
0.10.0
2 parents 503a5cb + a4e41ee commit 0ef856d

25 files changed

+849
-87
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ Then need to add implementation of QuickBlox UIKit and QuickBlox SDK to dependen
7474

7575
```
7676
dependencies {
77-
implementation "com.quickblox:android-ui-kit:0.9.0"
77+
implementation "com.quickblox:android-ui-kit:0.10.0"
7878
79-
implementation 'com.quickblox:quickblox-android-sdk-messages:4.1.1'
80-
implementation 'com.quickblox:quickblox-android-sdk-chat:4.1.1'
81-
implementation 'com.quickblox:quickblox-android-sdk-content:4.1.1'
79+
implementation 'com.quickblox:quickblox-android-sdk-messages:4.2.2'
80+
implementation 'com.quickblox:quickblox-android-sdk-chat:4.2.2'
81+
implementation 'com.quickblox:quickblox-android-sdk-content:4.2.2'
8282
}
8383
```
8484

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id 'com.android.library' version '7.2.2' apply false
3-
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
2+
id 'com.android.library' version '8.2.0' apply false
3+
id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
44
}
55

66
task clean(type: Delete) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Oct 17 15:31:17 CEST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

ui-kit/build.gradle

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@ plugins {
77
}
88

99
ext {
10-
qbSdkVersion = '4.1.1'
10+
qbSdkVersion = '4.2.2'
1111

1212
uiKitVersionCode = 1
13-
uiKitVersionName = "0.9.0"
13+
uiKitVersionName = "0.10.0"
1414
}
1515

1616
android {
1717
namespace = "com.quickblox.android_ui_kit"
1818

19-
compileSdk 33
20-
2119
defaultConfig {
20+
compileSdk 34
2221
minSdkVersion 21
23-
targetSdkVersion 33
22+
targetSdkVersion 34
2423
versionCode uiKitVersionCode
2524
versionName uiKitVersionName
2625

@@ -52,12 +51,12 @@ android {
5251
}
5352

5453
compileOptions {
55-
sourceCompatibility JavaVersion.VERSION_1_8
56-
targetCompatibility JavaVersion.VERSION_1_8
54+
sourceCompatibility JavaVersion.VERSION_17
55+
targetCompatibility JavaVersion.VERSION_17
5756
}
5857

5958
kotlinOptions {
60-
jvmTarget = '1.8'
59+
jvmTarget = '17'
6160
}
6261

6362
testOptions {
@@ -70,34 +69,35 @@ dependencies {
7069
api "com.quickblox:quickblox-android-sdk-messages:$qbSdkVersion"
7170
api "com.quickblox:quickblox-android-sdk-chat:$qbSdkVersion"
7271
api "com.quickblox:quickblox-android-sdk-content:$qbSdkVersion"
72+
api "com.quickblox:quickblox-android-sdk-ai:$qbSdkVersion"
7373

7474
// QuickBlox AI
7575
api "com.quickblox:android-ai-answer-assistant:2.0.0"
7676
api "com.quickblox:android-ai-translate:2.0.0"
7777
api "com.quickblox:android-ai-editing-assistant:2.1.0"
7878

79-
implementation 'androidx.fragment:fragment-ktx:1.5.6'
80-
implementation 'androidx.core:core-ktx:1.9.0'
81-
implementation 'androidx.appcompat:appcompat:1.6.1'
82-
implementation 'com.google.android.material:material:1.8.0'
79+
implementation 'androidx.fragment:fragment-ktx:1.8.2'
80+
implementation 'androidx.core:core-ktx:1.13.1'
81+
implementation 'androidx.appcompat:appcompat:1.7.0'
82+
implementation 'com.google.android.material:material:1.12.0'
8383
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
84-
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
85-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
84+
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.4'
85+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
8686
implementation 'android.arch.lifecycle:extensions:1.1.1'
8787

8888
// Glide
8989
implementation 'com.github.bumptech.glide:glide:4.15.0'
9090

9191
// Coroutines and Kotlin Flow
92-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
93-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
92+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
93+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
9494

9595
// Tests
9696
testImplementation 'junit:junit:4.13.2'
97-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
97+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
9898
testImplementation "org.mockito.kotlin:mockito-kotlin:4.1.0"
99-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
100-
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
99+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
100+
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
101101
testImplementation 'org.json:json:20231013'
102102
}
103103

@@ -106,7 +106,7 @@ kapt {
106106
}
107107

108108
jacoco {
109-
toolVersion = "0.8.8"
109+
toolVersion = "0.8.12"
110110
}
111111

112112
publishing {
@@ -144,9 +144,9 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) {
144144
def enabledCSV = false
145145

146146
reports {
147-
xml { enabled enabledXML }
148-
html { enabled enabledHTML }
149-
csv { enabled enabledCSV }
147+
xml.required = enabledXML
148+
html.required = enabledHTML
149+
csv.required = enabledCSV
150150
}
151151

152152
def sourceFile = "${project.projectDir}/src/main/java"

ui-kit/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.quickblox.android_ui_kit">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<uses-permission android:name="android.permission.INTERNET" />
65
<uses-permission android:name="android.permission.CAMERA" />

0 commit comments

Comments
 (0)