Merge branch 'master' into update_package_info_plus_deriv_auth

deriv-com · Jan 23, 2024 · 3e05d03 · 3e05d03
2 parents 2342d66 + 2289efc
commit 3e05d03
Show file tree

Hide file tree

Showing 23 changed files with 251 additions and 117 deletions.
diff --git a/.github/workflows/version.yaml b/.github/workflows/version.yaml
@@ -41,33 +41,32 @@ jobs:
       - name: Create git tag based on version
         run: melos version --all --yes
 
-      - name: Push tag
-        id: push-tag
-        run: |
-          output=$(git push --tags 2>&1)
-
-          if [[ $output == *"Everything up-to-date"* ]]; then
-            echo "PUSH_OUTPUT=No package updated" >> $GITHUB_OUTPUT
-          else
-            echo "PUSH_OUTPUT=Packages updated" >> $GITHUB_OUTPUT
-          fi
-        shell: bash
-
       - name: Get new tags
         id: new-tags
-        if: ${{ contains(steps.push-tag.outputs.PUSH_OUTPUT, 'Packages updated') }}
         run: |
           local_tags=$(git tag)
           remote_tags=$(git ls-remote --tags origin | cut -d/ -f3)
           new_tags=$(comm -23 <(sort <<<"$local_tags") <(sort <<<"$remote_tags"))
 
           # Format new tags into a single line with '\n' between tags
-          formatted_tags=$(echo -e "$new_tags" | tr '\n' '\\n')
+          formatted_tags=$(echo -e "$new_tags" | tr '\n' '  ')
 
           # Append the formatted tags to the file
           echo -e "NEW_TAGS=$formatted_tags" >> "$GITHUB_OUTPUT"
         shell: bash
 
+      - name: Push tag
+        id: push-tag
+        run: |
+          output=$(git push --tags 2>&1)
+
+          if [[ $output == *"Everything up-to-date"* ]]; then
+            echo "PUSH_OUTPUT=No package updated" >> $GITHUB_OUTPUT
+          else
+            echo "PUSH_OUTPUT=Packages updated" >> $GITHUB_OUTPUT
+          fi
+        shell: bash
+
       - name: Make the script files executable
         if: ${{ contains(steps.push-tag.outputs.PUSH_OUTPUT, 'Packages updated') }}
         run: chmod +x readme.sh
@@ -87,6 +86,7 @@ jobs:
 
       - name: Send Slack Notification
         uses: ./.github/actions/send_slack_notifications
+        if: ${{ contains(steps.push-tag.outputs.PUSH_OUTPUT, 'Packages updated') }}
         with:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
           PR_TITLE: ${{ github.event.pull_request.title }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,116 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-01-23
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`deriv_banner` - `v0.0.1+1`](#deriv_banner---v0011)
+ - [`deriv_store_launcher` - `v0.0.1+1`](#deriv_store_launcher---v0011)
+
+---
+
+#### `deriv_banner` - `v0.0.1+1`
+
+ - **REFACTOR**(deriv_banner): updated kotlin version ([#399](https://github.com/regentmarkets/flutter-deriv-packages/issues/399)). ([9c19b5b4](https://github.com/regentmarkets/flutter-deriv-packages/commit/9c19b5b45aaa40897a7b9884794ab9cbb29fe4ff))
+
+#### `deriv_store_launcher` - `v0.0.1+1`
+
+ - **REFACTOR**(deriv_store_launcher): udpated kotlin and gradle version ([#400](https://github.com/regentmarkets/flutter-deriv-packages/issues/400)). ([ad9d72e1](https://github.com/regentmarkets/flutter-deriv-packages/commit/ad9d72e10186e695a72d022d3b3f6ebdd5120666))
+
+
+## 2024-01-23
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`update_checker` - `v1.2.1`](#update_checker---v121)
+
+---
+
+#### `update_checker` - `v1.2.1`
+
+ - **REFACTOR**(update_checker): increase package info plus version ([#407](https://github.com/regentmarkets/flutter-deriv-packages/issues/407)). ([5147c12b](https://github.com/regentmarkets/flutter-deriv-packages/commit/5147c12bd6b49aed82dd4e3036f63de79816edba))
+
+
+## 2024-01-23
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`deriv_web_socket_client` - `v1.0.1`](#deriv_web_socket_client---v101)
+
+---
+
+#### `deriv_web_socket_client` - `v1.0.1`
+
+ - **REFACTOR**: rename ConnectionState to DerivConnectionState ([#384](https://github.com/regentmarkets/flutter-deriv-packages/issues/384)). ([0252a312](https://github.com/regentmarkets/flutter-deriv-packages/commit/0252a3120fd5f78b7d4a1aa61c0f0ca3f41de40a))
+
+
+## 2024-01-23
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`deriv_auth` - `v2.0.2`](#deriv_auth---v202)
+
+---
+
+#### `deriv_auth` - `v2.0.2`
+
+ - **FIX**(deriv_auth): fix overflow issue in change password layout ([#404](https://github.com/regentmarkets/flutter-deriv-packages/issues/404)). ([abd05684](https://github.com/regentmarkets/flutter-deriv-packages/commit/abd056841f774ffb806e76569b60701d2fa74808))
+
+
+## 2024-01-23
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`deriv_auth` - `v2.0.1`](#deriv_auth---v201)
+
+---
+
+#### `deriv_auth` - `v2.0.1`
+
+ - **REFACTOR**(deriv_auth): updated package_info_plus ([#401](https://github.com/regentmarkets/flutter-deriv-packages/issues/401)). ([16d402a4](https://github.com/regentmarkets/flutter-deriv-packages/commit/16d402a45e680df0734f04fb5dee7f4eb1067119))
+
+
 ## 2024-01-15
 
 ### Changes

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This repository contains private packages & plugins that are used by the company
 
 ## Using the packages
 
-Each package has been released as git tag with convention as **packageName-vVersionNumber**`(Example: deriv_auth-v2.0.0)`. To use the package, add the following to your pubspec.yaml file:
+Each package has been released as git tag with convention as **packageName-vVersionNumber**`(Example: deriv_auth-v2.0.2)`. To use the package, add the following to your pubspec.yaml file:
 
 ```yaml
 deriv_ui:
@@ -19,8 +19,8 @@ deriv_ui:
 | Name                                                                      | Description                                                                                                            | Version                                                           |
 | ------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------- |
 | [analytics](./packages/analytics)                                         | Used to collect and send analytical information to 'Firebase' and 'Segment'.                                           | [v1.0.2](./packages/analytics/CHANGELOG.md)                       |
-| [deriv_auth](./packages/deriv_auth)                                       | A Dart package that provides Authentication logic for Deriv applications.                                              | [v2.0.0 ](./packages/deriv_auth/CHANGELOG.md)                     |
-| [deriv_banner](./packages/deriv_banner)                                   | A widget to show banner in apps.                                                                                       | [v0.0.1](./packages/deriv_banner/CHANGELOG.md)                    |
+| [deriv_auth](./packages/deriv_auth)                                       | A Dart package that provides Authentication logic for Deriv applications.                                              | [v2.0.2 ](./packages/deriv_auth/CHANGELOG.md)                     |
+| [deriv_banner](./packages/deriv_banner)                                   | A widget to show banner in apps.                                                                                       | [v0.0.1+1](./packages/deriv_banner/CHANGELOG.md)                    |
 | [deriv_bloc_manager](./packages/deriv_bloc_manager)                       | Provides some tools to manage blocs.                                                                                   | [v0.0.1](./packages/deriv_bloc_manager/CHANGELOG.md)              |
 | [deriv_datadog](./packages/deriv_datadog)                                 | A package that helps you monitor the performance and user interactions of your Flutter app by sending data to Datadog. | [v0.0.1](./packages/deriv_datadog/CHANGELOG.md)                   |
 | [deriv_date_range_picker](./packages/deriv_date_range_picker)             | Provides a widget that allows users to select a date range either by calendar mode or input mode.                      | [v0.0.1+2](./packages/deriv_date_range_picker/CHANGELOG.md)       |
@@ -33,15 +33,15 @@ deriv_ui:
 | [deriv_localizations](./packages/deriv_localizations)                             | A Package that contains the localization arb(coming from Crowdin) and dart generated files for flutter_deriv_packages.                                                                            |
 | [deriv_numpad](./packages/deriv_numpad)                                   | Number Pad Widget for number input.                                                                                    | [v1.1.0](./packages/deriv_numpad/CHANGELOG.md)                    |
 | [deriv_rudderstack](./packages/deriv_rudderstack)                         | A plugin that add RudderStack SDK support to Flutter.                                                                  | [v1.1.0](./packages/deriv_rudderstack/CHANGELOG.md)               |
-| [deriv_store_launcher](./packages/deriv_store_launcher)                   | A plugin to launch app stores base on platform and manufacturer.                                                       | [v0.0.1](./packages/deriv_store_launcher/CHANGELOG.md)            |
+| [deriv_store_launcher](./packages/deriv_store_launcher)                   | A plugin to launch app stores base on platform and manufacturer.                                                       | [v0.0.1+1](./packages/deriv_store_launcher/CHANGELOG.md)            |
 | [deriv_technical_analysis](./packages/deriv_technical_analysis)           | A Dart package for Technical Analysis.                                                                                 | [v0.0.1](./packages/deriv_technical_analysis/CHANGELOG.md)        |
 | [deriv_theme](./packages/deriv_theme)                                     | A package that contains the theme used by Deriv products.                                                              | [v2.2.0](./packages/deriv_theme/CHANGELOG.md)                     |
 | [deriv_ui](./packages/deriv_ui)                                           | A package that contains the UI components used by Deriv products.                                                      | [v0.0.2+1](./packages/deriv_ui/CHANGELOG.md)                        |
 | [deriv_utilities](./packages/deriv_utilities)                             | A package that contains the utilities including helper functions, mixins, and extensions.                              | [v1.0.0](./packages/deriv_utilities/CHANGELOG.md)                 |
-| [deriv_websocket](./packages/deriv_web_socket_client)                     | A package that provides a easy to use websocket client.                                                                | [v1.0.0](./packages/deriv_web_socket_client/CHANGELOG.md)         |
+| [deriv_websocket](./packages/deriv_web_socket_client)                     | A package that provides a easy to use websocket client.                                                                | [v1.0.1](./packages/deriv_web_socket_client/CHANGELOG.md)         |
 | [deriv_web_view](./packages/deriv_web_view)                               | Deriv web view package.                                                                                                | [v0.0.1+1](./packages/deriv_web_view/CHANGELOG.md)                  |
 | [form_builder](./packages/form_builder)                                   | A simpler and cleaner way to create, validate and submit forms.                                                        | [v1.0.0+1](./packages/form_builder/CHANGELOG.md)                  |
-| [update_checker](./packages/update_checker)                               | Check and retrieve update information from the server for the given package.                                           | [v1.2.0](./packages/update_checker/CHANGELOG.md)                  |
+| [update_checker](./packages/update_checker)                               | Check and retrieve update information from the server for the given package.                                           | [v1.2.1](./packages/update_checker/CHANGELOG.md)                  |
 | [deriv_feature_flag](./packages/deriv_feature_flag)                       | A package to provide feature flag functionality for apps.                                                              | [v0.0.1](./packages/deriv_feature_flag/CHANGELOG.md)              |
 
 ## Environment Setup

diff --git a/packages/deriv_auth/CHANGELOG.md b/packages/deriv_auth/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.0.2
+
+ - **FIX**(deriv_auth): fix overflow issue in change password layout ([#404](https://github.com/regentmarkets/flutter-deriv-packages/issues/404)). ([abd05684](https://github.com/regentmarkets/flutter-deriv-packages/commit/abd056841f774ffb806e76569b60701d2fa74808))
+
+## 2.0.1
+
+ - **REFACTOR**(deriv_auth): updated package_info_plus ([#401](https://github.com/regentmarkets/flutter-deriv-packages/issues/401)). ([16d402a4](https://github.com/regentmarkets/flutter-deriv-packages/commit/16d402a45e680df0734f04fb5dee7f4eb1067119))
+
 ## 2.0.0
 
 > Note: This release has breaking changes.

diff --git a/...v_auth/lib/features/reset_password/presentation/layouts/deriv_choose_new_pass_layout.dart b/...v_auth/lib/features/reset_password/presentation/layouts/deriv_choose_new_pass_layout.dart
@@ -69,14 +69,16 @@ class _DerivChooseNewPassLayoutState extends State<DerivChooseNewPassLayout> {
         child: Center(
           child: Form(
             key: _formKey,
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: <Widget>[
-                const SizedBox(height: ThemeProvider.margin72),
-                _buildContent(),
-                const SizedBox(height: ThemeProvider.margin24),
-                _buildSubmitPassButton()
-              ],
+            child: SingleChildScrollView(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
+                  const SizedBox(height: ThemeProvider.margin72),
+                  _buildContent(),
+                  const SizedBox(height: ThemeProvider.margin24),
+                  _buildSubmitPassButton()
+                ],
+              ),
             ),
           ),
         ),
@@ -89,53 +91,49 @@ class _DerivChooseNewPassLayoutState extends State<DerivChooseNewPassLayout> {
 
           return true;
         },
-        child: SingleChildScrollView(
-          child: Column(
-            children: <Widget>[
-              Center(
-                child: SvgPicture.asset(
-                  Assets.chooseNewPassIcon,
-                  package: 'deriv_auth',
-                  width: ThemeProvider.iconSize96,
-                  height: ThemeProvider.iconSize32,
-                ),
-              ),
-              const SizedBox(height: ThemeProvider.margin48),
-              Text(
-                context.localization.labelChooseNewPass,
-                style: TextStyles.title,
+        child: Column(
+          children: <Widget>[
+            Center(
+              child: SvgPicture.asset(
+                Assets.chooseNewPassIcon,
+                package: 'deriv_auth',
+                width: ThemeProvider.iconSize96,
+                height: ThemeProvider.iconSize32,
               ),
-              const SizedBox(height: ThemeProvider.margin24),
-              BaseTextField(
-                controller: _passController,
-                focusNode: _passFocusNode,
-                labelText: context.localization.labelCreatePass,
-                obscureText: !_isPasswordVisible,
-                suffixIcon: IconButton(
-                  icon: Icon(
-                    _isPasswordVisible
-                        ? Icons.visibility
-                        : Icons.visibility_off,
-                    color: context.theme.colors.disabled,
-                  ),
-                  splashColor: Colors.transparent,
-                  highlightColor: Colors.transparent,
-                  onPressed: () =>
-                      setState(() => _isPasswordVisible = !_isPasswordVisible),
+            ),
+            const SizedBox(height: ThemeProvider.margin48),
+            Text(
+              context.localization.labelChooseNewPass,
+              style: TextStyles.title,
+            ),
+            const SizedBox(height: ThemeProvider.margin24),
+            BaseTextField(
+              controller: _passController,
+              focusNode: _passFocusNode,
+              labelText: context.localization.labelCreatePass,
+              obscureText: !_isPasswordVisible,
+              suffixIcon: IconButton(
+                icon: Icon(
+                  _isPasswordVisible ? Icons.visibility : Icons.visibility_off,
+                  color: context.theme.colors.disabled,
                 ),
-                validator: _passwordValidator,
-                onChanged: (_) => setState(() {}),
-                onEditingComplete: () => _formKey.currentState?.validate(),
+                splashColor: Colors.transparent,
+                highlightColor: Colors.transparent,
+                onPressed: () =>
+                    setState(() => _isPasswordVisible = !_isPasswordVisible),
               ),
-              const SizedBox(height: ThemeProvider.margin40),
-              PasswordPolicyCheckerWidget(
-                passwordController: _passController,
-                policies: PasswordPolicyCheckerWidget.getDerivPasswordPolicies(
-                  context,
-                ),
+              validator: _passwordValidator,
+              onChanged: (_) => setState(() {}),
+              onEditingComplete: () => _formKey.currentState?.validate(),
+            ),
+            const SizedBox(height: ThemeProvider.margin40),
+            PasswordPolicyCheckerWidget(
+              passwordController: _passController,
+              policies: PasswordPolicyCheckerWidget.getDerivPasswordPolicies(
+                context,
               ),
-            ],
-          ),
+            ),
+          ],
         ),
       );
 

diff --git a/packages/deriv_auth/pubspec.yaml b/packages/deriv_auth/pubspec.yaml
@@ -1,6 +1,6 @@
 name: deriv_auth
 description: Provides deriv authentication functionalities for dart/flutter apps.
-version: 2.0.0
+version: 2.0.2
 
 environment:
   sdk: ">=3.0.0 <4.0.0"

diff --git a/packages/deriv_banner/CHANGELOG.md b/packages/deriv_banner/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.1+1
+
+ - **REFACTOR**(deriv_banner): updated kotlin version ([#399](https://github.com/regentmarkets/flutter-deriv-packages/issues/399)). ([9c19b5b4](https://github.com/regentmarkets/flutter-deriv-packages/commit/9c19b5b45aaa40897a7b9884794ab9cbb29fe4ff))
+
 ## 0.0.1
 
 - initial release.
diff --git a/packages/deriv_banner/android/build.gradle b/packages/deriv_banner/android/build.gradle
@@ -2,7 +2,7 @@ group 'com.deriv.app.deriv_banner'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.20'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/deriv_banner/pubspec.yaml b/packages/deriv_banner/pubspec.yaml
@@ -1,7 +1,7 @@
 name: deriv_banner
 description: A new flutter plugin project.
 
-version: 0.0.1
+version: 0.0.1+1
 
 homepage: https://deriv.com/
 publish_to: "none"

diff --git a/packages/deriv_store_launcher/CHANGELOG.md b/packages/deriv_store_launcher/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.1+1
+
+ - **REFACTOR**(deriv_store_launcher): udpated kotlin and gradle version ([#400](https://github.com/regentmarkets/flutter-deriv-packages/issues/400)). ([ad9d72e1](https://github.com/regentmarkets/flutter-deriv-packages/commit/ad9d72e10186e695a72d022d3b3f6ebdd5120666))
+
 ## 0.0.1
 
 - initial release.
diff --git a/packages/deriv_store_launcher/android/build.gradle b/packages/deriv_store_launcher/android/build.gradle
@@ -2,14 +2,14 @@ group 'com.deriv.app.deriv_store_launcher'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.20'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }