diff --git a/.github/no-response.yml b/.github/no-response.yml new file mode 100644 index 0000000..e834903 --- /dev/null +++ b/.github/no-response.yml @@ -0,0 +1,15 @@ +# Configuration for probot-no-response - https://github.com/probot/no-response + +# Number of days of inactivity before an issue is closed for lack of response. +daysUntilClose: 7 + +# Label requiring a response. +responseRequiredLabel: "waiting for customer response" + +# Comment to post when closing an Issue for lack of response. Set to `false` to disable +closeComment: > + Without additional information, we are unfortunately not sure how to + resolve this issue. We are therefore reluctantly going to close this + bug for now. Please don't hesitate to comment on the bug if you have + any more information for us; we will reopen it right away! + Thanks for your contribution. \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e639a80..4cd4204 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: run: | flutter pub get - name: Copy production config - run: echo ${{ secrets.PRODUCTION_CONFIG }} > lib/app_config.dart + run: echo "${{ secrets.PRODUCTION_CONFIG }}" > lib/app_config.dart - name: Build and release env: MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} @@ -57,7 +57,7 @@ jobs: - run: | flutter pub get - name: Copy production config - run: echo ${{ secrets.PRODUCTION_CONFIG }} > lib/app_config.dart + run: echo "${{ secrets.PRODUCTION_CONFIG }}" > lib/app_config.dart - name: Build run: | flutter build apk @@ -66,3 +66,15 @@ jobs: with: name: android-stream-chat-v1 path: packages/stream_chat_v1/build/app/outputs/apk/release/app-release.apk + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + - name: Upload APK + run: | + cp build/app/outputs/apk/release/app-release.apk flutter-sample-app.apk + aws s3 cp flutter-sample-app.apk s3://${{ secrets.AWS_S3_BUCKET }} --sse AES256 + + diff --git a/packages/chatty/lib/ui/profile_verify/profile_verify_cubit.dart b/packages/chatty/lib/ui/profile_verify/profile_verify_cubit.dart index 0dd4824..2f32aa7 100644 --- a/packages/chatty/lib/ui/profile_verify/profile_verify_cubit.dart +++ b/packages/chatty/lib/ui/profile_verify/profile_verify_cubit.dart @@ -27,8 +27,8 @@ class ProfileVerifyCubit extends Cubit { final ProfileSignInUseCase _profileSignInUseCase; void startChatting() async { - emit(ProfileState(null, loading: true)); final file = state.file; + emit(ProfileState(file, loading: true)); final name = nameController.text; await _profileSignInUseCase.verify(ProfileInput( imageFile: file, diff --git a/packages/stream_chat_v1/android/app/build.gradle b/packages/stream_chat_v1/android/app/build.gradle index e91ca1b..ce7eeee 100644 --- a/packages/stream_chat_v1/android/app/build.gradle +++ b/packages/stream_chat_v1/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 29 + compileSdkVersion 30 ndkVersion '21.4.7075529' sourceSets { @@ -41,7 +41,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.example" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/stream_chat_v1/android/build.gradle b/packages/stream_chat_v1/android/build.gradle index 8c57e18..aeb95a6 100644 --- a/packages/stream_chat_v1/android/build.gradle +++ b/packages/stream_chat_v1/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.5.20' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.2' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.2' } diff --git a/packages/stream_chat_v1/android/gradle/wrapper/gradle-wrapper.properties b/packages/stream_chat_v1/android/gradle/wrapper/gradle-wrapper.properties index c0a81d1..bdbde4d 100644 --- a/packages/stream_chat_v1/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/stream_chat_v1/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip diff --git a/packages/stream_chat_v1/lib/choose_user_page.dart b/packages/stream_chat_v1/lib/choose_user_page.dart index e487acd..7a4f263 100644 --- a/packages/stream_chat_v1/lib/choose_user_page.dart +++ b/packages/stream_chat_v1/lib/choose_user_page.dart @@ -7,6 +7,7 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:stream_chat_flutter/stream_chat_flutter.dart'; +import 'main.dart'; import 'routes/routes.dart'; const kStreamApiKey = 'STREAM_API_KEY'; @@ -93,7 +94,7 @@ class ChooseUserPage extends StatelessWidget { final client = StreamChatClient( kDefaultStreamApiKey, logLevel: Level.INFO, - ); + )..chatPersistenceClient = chatPersistentClient; await client.connectUser( user, diff --git a/packages/stream_chat_v1/lib/main.dart b/packages/stream_chat_v1/lib/main.dart index e17ef4a..bdbee24 100644 --- a/packages/stream_chat_v1/lib/main.dart +++ b/packages/stream_chat_v1/lib/main.dart @@ -47,7 +47,7 @@ class _MyAppState extends State final client = StreamChatClient( apiKey ?? kDefaultStreamApiKey, logLevel: Level.SEVERE, - ); + )..chatPersistenceClient = chatPersistentClient; if (userId != null && token != null) { await client.connectUser( diff --git a/packages/stream_chat_v1/pubspec.yaml b/packages/stream_chat_v1/pubspec.yaml index 6d39645..dd69063 100644 --- a/packages/stream_chat_v1/pubspec.yaml +++ b/packages/stream_chat_v1/pubspec.yaml @@ -1,7 +1,7 @@ name: example description: A new Flutter project. publish_to: 'none' -version: 1.6.1 +version: 1.7.0 environment: sdk: '>=2.12.0 <3.0.0' @@ -10,16 +10,8 @@ dependencies: flutter_app_badger: ^1.2.0 flutter: sdk: flutter - stream_chat_flutter: - git: - url: https://github.com/GetStream/stream-chat-flutter.git - ref: develop - path: packages/stream_chat_flutter - stream_chat_persistence: - git: - url: https://github.com/GetStream/stream-chat-flutter.git - ref: develop - path: packages/stream_chat_persistence + stream_chat_flutter: ^2.0.0 + stream_chat_persistence: ^2.0.0 flutter_local_notifications: ^5.0.0+4 flutter_svg: ^0.22.0 flutter_secure_storage: ^4.2.0 @@ -29,18 +21,6 @@ dependencies: lottie: ^1.0.1 collection: ^1.15.0-nullsafety.4 -dependency_overrides: - stream_chat: - git: - url: https://github.com/GetStream/stream-chat-flutter.git - ref: develop - path: packages/stream_chat - stream_chat_flutter_core: - git: - url: https://github.com/GetStream/stream-chat-flutter.git - ref: develop - path: packages/stream_chat_flutter_core - dev_dependencies: flutter_launcher_icons: ^0.9.0 test: any