diff --git a/.github/workflows/scripts/install-tools.sh b/.github/workflows/scripts/install-tools.sh index 087cfecb..b83f55f0 100755 --- a/.github/workflows/scripts/install-tools.sh +++ b/.github/workflows/scripts/install-tools.sh @@ -1,6 +1,6 @@ #!/bin/bash -flutter pub global activate melos +flutter pub global activate melos 0.4.0-dev.2 echo "::add-path::$HOME/.pub-cache/bin" echo "::add-path::$GITHUB_WORKSPACE/_flutter/.pub-cache/bin" echo "::add-path::$GITHUB_WORKSPACE/_flutter/bin/cache/dart-sdk/bin" \ No newline at end of file diff --git a/melos.yaml b/melos.yaml index ea99c335..7e02909f 100644 --- a/melos.yaml +++ b/melos.yaml @@ -55,5 +55,5 @@ dev_dependencies: pedantic: 1.9.2 environment: - sdk: ">=2.1.0 <3.0.0" - flutter: ">=1.12.13+hotfix.5 <2.0.0" \ No newline at end of file + sdk: ">=2.7.0 <3.0.0" + flutter: ">=1.22.4 <2.0.0" \ No newline at end of file diff --git a/packages/dart_client/example/.gitignore b/packages/dart_client/example/.gitignore index 0fa6b675..9d532b18 100644 --- a/packages/dart_client/example/.gitignore +++ b/packages/dart_client/example/.gitignore @@ -39,8 +39,3 @@ app.*.symbols # Obfuscation related app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release diff --git a/packages/dart_client/example/.metadata b/packages/dart_client/example/.metadata index 48acef37..182cccaf 100644 --- a/packages/dart_client/example/.metadata +++ b/packages/dart_client/example/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 5d36f2e7f5387b6c751449258ade8e4e6edf99be - channel: beta + revision: 78910062997c3a836feee883712c241a5fd22983 + channel: stable project_type: app diff --git a/packages/dart_client/example/android/app/build.gradle b/packages/dart_client/example/android/app/build.gradle index 0a93e89f..3932aa91 100644 --- a/packages/dart_client/example/android/app/build.gradle +++ b/packages/dart_client/example/android/app/build.gradle @@ -26,17 +26,21 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 29 sourceSets { main.java.srcDirs += 'src/main/kotlin' } + lintOptions { + disable 'InvalidPackage' + } + defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "io.getstream.stream_chat_dart_example.stream_chat_dart_example" + applicationId "com.example.example" minSdkVersion 16 - targetSdkVersion 30 + targetSdkVersion 29 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/dart_client/example/android/app/src/debug/AndroidManifest.xml b/packages/dart_client/example/android/app/src/debug/AndroidManifest.xml index f590dd7e..c208884f 100644 --- a/packages/dart_client/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/dart_client/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.example"> diff --git a/packages/dart_client/example/android/app/src/main/AndroidManifest.xml b/packages/dart_client/example/android/app/src/main/AndroidManifest.xml index 54736655..55ca830c 100644 --- a/packages/dart_client/example/android/app/src/main/AndroidManifest.xml +++ b/packages/dart_client/example/android/app/src/main/AndroidManifest.xml @@ -1,7 +1,13 @@ - + + - - - - - - - diff --git a/packages/dart_client/example/android/app/src/main/res/values-night/styles.xml b/packages/dart_client/example/android/app/src/main/res/values-night/styles.xml deleted file mode 100644 index 449a9f93..00000000 --- a/packages/dart_client/example/android/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/packages/dart_client/example/android/app/src/main/res/values/styles.xml b/packages/dart_client/example/android/app/src/main/res/values/styles.xml index d74aa35c..1f83a33f 100644 --- a/packages/dart_client/example/android/app/src/main/res/values/styles.xml +++ b/packages/dart_client/example/android/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ - - diff --git a/packages/dart_client/example/android/app/src/profile/AndroidManifest.xml b/packages/dart_client/example/android/app/src/profile/AndroidManifest.xml index f590dd7e..c208884f 100644 --- a/packages/dart_client/example/android/app/src/profile/AndroidManifest.xml +++ b/packages/dart_client/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.example"> diff --git a/packages/dart_client/example/android/build.gradle b/packages/dart_client/example/android/build.gradle index c505a863..3100ad2d 100644 --- a/packages/dart_client/example/android/build.gradle +++ b/packages/dart_client/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/dart_client/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/dart_client/example/android/gradle/wrapper/gradle-wrapper.properties index bc6a58af..296b146b 100644 --- a/packages/dart_client/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/dart_client/example/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-5.6.2-all.zip diff --git a/packages/dart_client/example/ios/Flutter/AppFrameworkInfo.plist b/packages/dart_client/example/ios/Flutter/AppFrameworkInfo.plist index 9367d483..6b4c0f78 100644 --- a/packages/dart_client/example/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/dart_client/example/ios/Flutter/AppFrameworkInfo.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleExecutable App CFBundleIdentifier diff --git a/packages/dart_client/example/ios/Flutter/Debug.xcconfig b/packages/dart_client/example/ios/Flutter/Debug.xcconfig index e8efba11..592ceee8 100644 --- a/packages/dart_client/example/ios/Flutter/Debug.xcconfig +++ b/packages/dart_client/example/ios/Flutter/Debug.xcconfig @@ -1,2 +1 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/packages/dart_client/example/ios/Flutter/Release.xcconfig b/packages/dart_client/example/ios/Flutter/Release.xcconfig index 399e9340..592ceee8 100644 --- a/packages/dart_client/example/ios/Flutter/Release.xcconfig +++ b/packages/dart_client/example/ios/Flutter/Release.xcconfig @@ -1,2 +1 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/packages/dart_client/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/dart_client/example/ios/Runner.xcworkspace/contents.xcworkspacedata index 21a3cc14..1d526a16 100644 --- a/packages/dart_client/example/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/packages/dart_client/example/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/packages/dart_client/example/ios/Runner/Info.plist b/packages/dart_client/example/ios/Runner/Info.plist index 816fd9f3..a060db61 100644 --- a/packages/dart_client/example/ios/Runner/Info.plist +++ b/packages/dart_client/example/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - stream_chat_dart_example + example CFBundlePackageType APPL CFBundleShortVersionString diff --git a/packages/dart_client/example/pubspec.yaml b/packages/dart_client/example/pubspec.yaml index 4d07128c..2a8b7eb2 100644 --- a/packages/dart_client/example/pubspec.yaml +++ b/packages/dart_client/example/pubspec.yaml @@ -1,7 +1,7 @@ -name: stream_chat_dart_example -description: Example using Stream's LLC +name: example +description: A new Flutter project. -publish_to: 'none' +publish_to: 'none' version: 1.0.0+1 environment: @@ -10,14 +10,12 @@ environment: dependencies: flutter: sdk: flutter - stream_chat: + cupertino_icons: ^1.0.0 + stream_chat: path: ../ dev_dependencies: flutter_test: sdk: flutter - integration_test: - sdk: flutter - flutter: uses-material-design: true \ No newline at end of file diff --git a/packages/dart_client/example/web/favicon.png b/packages/dart_client/example/web/favicon.png deleted file mode 100644 index 8aaa46ac..00000000 Binary files a/packages/dart_client/example/web/favicon.png and /dev/null differ diff --git a/packages/dart_client/example/web/icons/Icon-192.png b/packages/dart_client/example/web/icons/Icon-192.png deleted file mode 100644 index b749bfef..00000000 Binary files a/packages/dart_client/example/web/icons/Icon-192.png and /dev/null differ diff --git a/packages/dart_client/example/web/icons/Icon-512.png b/packages/dart_client/example/web/icons/Icon-512.png deleted file mode 100644 index 88cfd48d..00000000 Binary files a/packages/dart_client/example/web/icons/Icon-512.png and /dev/null differ diff --git a/packages/dart_client/example/web/index.html b/packages/dart_client/example/web/index.html deleted file mode 100644 index 6f6d6461..00000000 --- a/packages/dart_client/example/web/index.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - stream_chat_dart_example - - - - - - - - diff --git a/packages/dart_client/example/web/manifest.json b/packages/dart_client/example/web/manifest.json deleted file mode 100644 index 5ee3b42d..00000000 --- a/packages/dart_client/example/web/manifest.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "stream_chat_dart_example", - "short_name": "stream_chat_dart_example", - "start_url": ".", - "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "Example using Stream's LLC", - "orientation": "portrait-primary", - "prefer_related_applications": false, - "icons": [ - { - "src": "icons/Icon-192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "icons/Icon-512.png", - "sizes": "512x512", - "type": "image/png" - } - ] -}