Skip to content

Commit 6dffc25

Browse files
committed
Merge branch 'develop' of https://github.com/GetStream/flutter-samples into new-filter
2 parents 74cdede + d5cff7e commit 6dffc25

File tree

9 files changed

+41
-33
lines changed

9 files changed

+41
-33
lines changed

.github/no-response.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Configuration for probot-no-response - https://github.com/probot/no-response
2+
3+
# Number of days of inactivity before an issue is closed for lack of response.
4+
daysUntilClose: 7
5+
6+
# Label requiring a response.
7+
responseRequiredLabel: "waiting for customer response"
8+
9+
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
10+
closeComment: >
11+
Without additional information, we are unfortunately not sure how to
12+
resolve this issue. We are therefore reluctantly going to close this
13+
bug for now. Please don't hesitate to comment on the bug if you have
14+
any more information for us; we will reopen it right away!
15+
Thanks for your contribution.

.github/workflows/build.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: |
3232
flutter pub get
3333
- name: Copy production config
34-
run: echo ${{ secrets.PRODUCTION_CONFIG }} > lib/app_config.dart
34+
run: echo "${{ secrets.PRODUCTION_CONFIG }}" > lib/app_config.dart
3535
- name: Build and release
3636
env:
3737
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
@@ -57,7 +57,7 @@ jobs:
5757
- run: |
5858
flutter pub get
5959
- name: Copy production config
60-
run: echo ${{ secrets.PRODUCTION_CONFIG }} > lib/app_config.dart
60+
run: echo "${{ secrets.PRODUCTION_CONFIG }}" > lib/app_config.dart
6161
- name: Build
6262
run: |
6363
flutter build apk
@@ -66,3 +66,15 @@ jobs:
6666
with:
6767
name: android-stream-chat-v1
6868
path: packages/stream_chat_v1/build/app/outputs/apk/release/app-release.apk
69+
- name: Configure AWS credentials
70+
uses: aws-actions/configure-aws-credentials@v1
71+
with:
72+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
73+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
74+
aws-region: us-east-1
75+
- name: Upload APK
76+
run: |
77+
cp build/app/outputs/apk/release/app-release.apk flutter-sample-app.apk
78+
aws s3 cp flutter-sample-app.apk s3://${{ secrets.AWS_S3_BUCKET }} --sse AES256
79+
80+

packages/chatty/lib/ui/profile_verify/profile_verify_cubit.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class ProfileVerifyCubit extends Cubit<ProfileState> {
2727
final ProfileSignInUseCase _profileSignInUseCase;
2828

2929
void startChatting() async {
30-
emit(ProfileState(null, loading: true));
3130
final file = state.file;
31+
emit(ProfileState(file, loading: true));
3232
final name = nameController.text;
3333
await _profileSignInUseCase.verify(ProfileInput(
3434
imageFile: file,

packages/stream_chat_v1/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 29
29+
compileSdkVersion 30
3030
ndkVersion '21.4.7075529'
3131

3232
sourceSets {
@@ -41,7 +41,7 @@ android {
4141
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4242
applicationId "com.example.example"
4343
minSdkVersion 21
44-
targetSdkVersion 29
44+
targetSdkVersion 30
4545
versionCode flutterVersionCode.toInteger()
4646
versionName flutterVersionName
4747
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

packages/stream_chat_v1/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.50'
2+
ext.kotlin_version = '1.5.20'
33
repositories {
44
google()
55
jcenter()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.6.2'
9+
classpath 'com.android.tools.build:gradle:4.2.2'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
classpath 'com.google.gms:google-services:4.3.2'
1212
}

packages/stream_chat_v1/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip

packages/stream_chat_v1/lib/choose_user_page.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
77
import 'package:flutter_svg/flutter_svg.dart';
88
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
99

10+
import 'main.dart';
1011
import 'routes/routes.dart';
1112

1213
const kStreamApiKey = 'STREAM_API_KEY';
@@ -93,7 +94,7 @@ class ChooseUserPage extends StatelessWidget {
9394
final client = StreamChatClient(
9495
kDefaultStreamApiKey,
9596
logLevel: Level.INFO,
96-
);
97+
)..chatPersistenceClient = chatPersistentClient;
9798

9899
await client.connectUser(
99100
user,

packages/stream_chat_v1/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class _MyAppState extends State<MyApp>
4747
final client = StreamChatClient(
4848
apiKey ?? kDefaultStreamApiKey,
4949
logLevel: Level.SEVERE,
50-
);
50+
)..chatPersistenceClient = chatPersistentClient;
5151

5252
if (userId != null && token != null) {
5353
await client.connectUser(

packages/stream_chat_v1/pubspec.yaml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: example
22
description: A new Flutter project.
33
publish_to: 'none'
4-
version: 1.6.1
4+
version: 1.7.0
55

66
environment:
77
sdk: '>=2.12.0 <3.0.0'
@@ -10,16 +10,8 @@ dependencies:
1010
flutter_app_badger: ^1.2.0
1111
flutter:
1212
sdk: flutter
13-
stream_chat_flutter:
14-
git:
15-
url: https://github.com/GetStream/stream-chat-flutter.git
16-
ref: develop
17-
path: packages/stream_chat_flutter
18-
stream_chat_persistence:
19-
git:
20-
url: https://github.com/GetStream/stream-chat-flutter.git
21-
ref: develop
22-
path: packages/stream_chat_persistence
13+
stream_chat_flutter: ^2.0.0
14+
stream_chat_persistence: ^2.0.0
2315
flutter_local_notifications: ^5.0.0+4
2416
flutter_svg: ^0.22.0
2517
flutter_secure_storage: ^4.2.0
@@ -29,18 +21,6 @@ dependencies:
2921
lottie: ^1.0.1
3022
collection: ^1.15.0-nullsafety.4
3123

32-
dependency_overrides:
33-
stream_chat:
34-
git:
35-
url: https://github.com/GetStream/stream-chat-flutter.git
36-
ref: develop
37-
path: packages/stream_chat
38-
stream_chat_flutter_core:
39-
git:
40-
url: https://github.com/GetStream/stream-chat-flutter.git
41-
ref: develop
42-
path: packages/stream_chat_flutter_core
43-
4424
dev_dependencies:
4525
flutter_launcher_icons: ^0.9.0
4626
test: any

0 commit comments

Comments
 (0)