Merge pull request #1165 from GetStream/develop

Next Major Release

Author: vishalnarkhede

.detoxrc.json

@@ -3,30 +3,6 @@
   "runnerConfig": "e2e/config.json",
   "skipLegacyWorkersInjection": true,
   "apps": {
-    "ios.native.debug": {
-      "name": "iOS NativeMessaging Debug",
-      "type": "ios.app",
-      "binaryPath": "examples/NativeMessaging/ios/build/Build/Products/Debug-iphonesimulator/NativeMessaging.app",
-      "build": "cd examples/NativeMessaging && xcodebuild -workspace ios/NativeMessaging.xcworkspace -scheme NativeMessaging -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build"
-    },
-    "ios.native.release": {
-      "name": "iOS NativeMessaging Release",
-      "type": "ios.app",
-      "binaryPath": "examples/NativeMessaging/ios/build/Build/Products/Release-iphonesimulator/NativeMessaging.app",
-      "build": "cd examples/NativeMessaging && xcodebuild -workspace ios/NativeMessaging.xcworkspace -scheme NativeMessaging -configuration Release -sdk iphonesimulator -derivedDataPath ios/build"
-    },
-    "android.native.debug": {
-      "name": "Android NativeMessaging Debug",
-      "type": "android.apk",
-      "binaryPath": "examples/NativeMessaging/android/app/build/outputs/apk/debug/app-debug.apk",
-      "build": "cd examples/NativeMessaging/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug"
-    },
-    "android.native.release": {
-      "name": "Android NativeMessaging Release",
-      "type": "android.apk",
-      "binaryPath": "examples/NativeMessaging/android/app/build/outputs/apk/release/app-release.apk",
-      "build": "cd examples/NativeMessaging/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release"
-    },
     "ios.sample.debug": {
       "name": "iOS SampleApp Debug",
       "type": "ios.app",
@@ -42,8 +18,8 @@
     "android.sample.debug": {
       "name": "Android SampleApp Debug",
       "type": "android.apk",
-      "binaryPath": "examples/SampleApp/android/app/build/outputs/apk/release/app-release.apk",
-      "build": "cd examples/SampleApp/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=debug"
+      "binaryPath": "examples/SampleApp/android/app/build/outputs/apk/debug/app-debug.apk",
+      "build": "cd examples/SampleApp/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug"
     },
     "android.sample.release": {
       "name": "Android SampleApp Release",
@@ -62,27 +38,11 @@
     "emulator": {
       "type": "android.emulator",
       "device": {
-        "avdName": "Pixel4"
+        "avdName": "Pixel_29_AOSP"
       }
     }
   },
   "configurations": {
-    "ios.native.debug": {
-      "device": "simulator",
-      "app": "ios.native.debug"
-    },
-    "ios.native.release": {
-      "device": "simulator",
-      "app": "ios.native.release"
-    },
-    "android.native.debug": {
-      "device": "emulator",
-      "app": "android.native.debug"
-    },
-    "android.native.release": {
-      "device": "emulator",
-      "app": "android.native.release"
-    },
     "ios.sample.debug": {
       "device": "simulator",
       "app": "ios.sample.debug"

.github/workflows/check-pr.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - develop
       - master
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+*beta*'
     types: [opened, synchronize]
 
 jobs:
@@ -22,6 +22,6 @@ jobs:
         # for the sdk package
         run: yarn --frozen-lockfile && yarn bootstrap-ci
       - name: Lint
-        run: yarn lint
+        run: yarn lerna-workspaces run lint && cd docusaurus && npx prettier --check '**/*.mdx'
       - name: Test
         run: yarn test:unit

.github/workflows/docusaurus.yml

@@ -15,6 +15,6 @@ jobs:
       - name: push
         uses: GetStream/push-stream-chat-docusaurus-action@main
         with:
-          target-branch: ${{ github.ref == 'refs/heads/master' && 'production' || 'staging' }}
+          target-branch: 'production'
         env:
           DOCUSAURUS_GH_TOKEN: ${{ secrets.DOCUSAURUS_GH_TOKEN }}

.github/workflows/legacy-sample-distribution.yml

@@ -3,9 +3,7 @@ name: legacy-sample-distribution
 on:
   push:
     branches:
-      - develop
-    paths:
-      - examples/SampleApp  
+      - v4.0.0
 jobs:
   build_and_deploy_ios_firebase:
     runs-on: [macos-latest]
@@ -19,10 +17,11 @@ jobs:
         run: npm install -g firebase-tools
       - name: RN setup
         run: |
+          cd package
           yarn;
           cd native-package
           yarn;
-          cd ../examples/SampleApp
+          cd ../../examples/SampleApp
           yarn;
           cd ios
           pod install
@@ -45,10 +44,11 @@ jobs:
       - name: RN setup
         run: |
           yarn add global react-native-cli;
+          cd package
           yarn;
           cd native-package
           yarn;
-          cd ../examples/SampleApp
+          cd ../../examples/SampleApp
           yarn;
       - name: Build
         run: |

.github/workflows/next-release.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Installation && Build SDK
         run: yarn --frozen-lockfile && yarn bootstrap-ci
       - name: Lint
-        run: yarn lerna-workspaces run lint
+        run: yarn lerna-workspaces run lint && (cd docusaurus; npx prettier --check '**/*.mdx')
       - name: Publish Next Release
         run: GITHUB_SHORT_SHA="$(git rev-parse --short $GITHUB_SHA)" yarn release-next
         env:

.github/workflows/release.yml

@@ -1,46 +1,46 @@
-name: Release
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  publish-release:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [12.x]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.VERSION_BUMP_TOKEN }}
-          # pulls all commits (needed for semantic release to correctly version)
-          fetch-depth: '0'
-      # pulls all tags (needed for semantic release to correctly version)
-      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node-version }}
-          registry-url: 'https://registry.npmjs.org'
-      - name: Prepare git
-        run: |
-          git config --global user.name "Vishal Narkhede"
-          git config --global user.email "[email protected]"
-      - name: Installation && Build SDK
-        run: yarn --frozen-lockfile && yarn bootstrap-ci
-      - name: Lint
-        run: yarn lerna-workspaces run lint
-      - name: Publish Release
-        run: yarn release
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
-          GH_TOKEN: ${{ secrets.VERSION_BUMP_TOKEN }}
-      - name: Merge back changes
-        run: |
-          git stash
-          git checkout develop
-          git pull origin develop
-          git merge master -m "chore: merge back release [skip ci]"
-          git push origin develop
+#name: Release
+#
+##on:
+##  push:
+##    branches:
+##      - master
+#
+#jobs:
+#  publish-release:
+#    runs-on: ubuntu-latest
+#    strategy:
+#      matrix:
+#        node-version: [12.x]
+#    steps:
+#      - uses: actions/checkout@v2
+#        with:
+#          token: ${{ secrets.VERSION_BUMP_TOKEN }}
+#          # pulls all commits (needed for semantic release to correctly version)
+#          fetch-depth: '0'
+#      # pulls all tags (needed for semantic release to correctly version)
+#      - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+#      - name: Use Node.js ${{ matrix.node-version }}
+#        uses: actions/setup-node@v2
+#        with:
+#          node-version: ${{ matrix.node-version }}
+#          registry-url: 'https://registry.npmjs.org'
+#      - name: Prepare git
+#        run: |
+#          git config --global user.name "Vishal Narkhede"
+#          git config --global user.email "[email protected]"
+#      - name: Installation && Build SDK
+#        run: yarn --frozen-lockfile && yarn bootstrap-ci
+#      - name: Lint
+#        run: yarn lerna-workspaces run lint && cd docusaurus && npx prettier --check '**/*.mdx'
+#      - name: Publish Release
+#        run: yarn release
+#        env:
+#          NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
+#          GH_TOKEN: ${{ secrets.VERSION_BUMP_TOKEN }}
+#      - name: Merge back changes
+#        run: |
+#          git stash
+#          git checkout develop
+#          git pull origin develop
+#          git merge master -m "chore: merge back release [skip ci]"
+#          git push origin develop

.github/workflows/sample-distribution.yml

@@ -3,9 +3,7 @@ name: sample-distribution
 on:
   push:
     branches:
-      - develop
-    paths:
-      - examples/SampleApp
+      - v4.0.0
 jobs:
   build_and_deploy_ios_testflight_qa:
     runs-on: [macos-latest]
@@ -18,14 +16,17 @@ jobs:
           cd examples/SampleApp/ios
           bundle update --bundler
       - name: RN setup
-        run: |
-          yarn;
-          cd native-package
-          yarn;
-          cd ../examples/SampleApp
-          yarn;
-          cd ios
-          pod install
+        uses: nick-invision/retry@v2
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          command: |
+            yarn && yarn bootstrap-ci;
+            cd package/native-package
+            yarn;
+            cd ../../examples/SampleApp
+            cd ios
+            pod update RCT-Folly --no-repo-update && pod install
       - name: Build and release Testflight QA
         env:
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
@@ -45,13 +46,15 @@ jobs:
         with:
           java-version: 1.8
       - name: RN setup
-        run: |
-          yarn add global react-native-cli;
-          yarn;
-          cd native-package
-          yarn;
-          cd ../examples/SampleApp
-          yarn;
+        uses: nick-invision/retry@v2
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          command: |
+            yarn add global react-native-cli;
+            yarn && yarn bootstrap-ci;
+            cd package/native-package
+            yarn;
       - name: Build
         run: |
           cd examples/SampleApp
@@ -68,6 +71,7 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
       - name: Upload APK
+        # https://getstream.io/downloads/rn-sample-app.apk
         run: |
           cp examples/SampleApp/android/app/build/outputs/apk/release/app-release.apk rn-sample-app.apk
           aws s3 cp rn-sample-app.apk s3://${{ secrets.AWS_S3_BUCKET }} --sse AES256

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 NEXT_RELEASE_CHANGELOG.md
+artifacts
+e2e/.env
 *.log

README.md

@@ -46,7 +46,7 @@ This repo includes 4 example apps. One made with Expo, one Native JavaScript cod
 
 - [Expo example](./examples/ExpoMessaging)
 - [Native example](./examples/NativeMessaging)
-- [Typescript example](./examples/TypescriptMessaging)
+- [Typescript example](./examples/TypeScriptMessaging)
 - [Fully featured messaging application](./examples/SampleApp)
 
 Besides, our team maintains a dedicated repository for fully-fledged sample applications and demos at [GetStream/react-native-samples](https://github.com/GetStream/react-native-samples). Please consider checking following sample applications:

bin/release.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+# shellcheck disable=SC2103
+
+set -eux
+
+if ! git diff --exit-code || ! git diff --cached --exit-code; then
+    echo "ERROR: UNCOMMITTED CHANGES"
+    exit 1
+fi
+
+echo "Mention the tag. Default - latest"
+read tag
+
+if [ -z "$tag" ]
+then
+      tag="latest"
+fi
+
+cd native-package
+npm version --no-git-tag-version "$1"
+sed -e 's|"stream-chat-react-native-core": "[^"]*"|"stream-chat-react-native-core": "'"$1"'"|g' -i.bak package.json
+rm package.json.bak
+
+cd ../expo-package
+npm version --no-git-tag-version "$1"
+sed -e 's|"stream-chat-react-native-core": "[^"]*"|"stream-chat-react-native-core": "'"$1"'"|g' -i.bak package.json
+rm package.json.bak
+cd ..
+
+sed -e 's|"version": "[^"]*"|"version": "'"$1"'"|g' -i.bak src/version.json
+rm src/version.json.bak
+
+git add {expo,native}-package/package.json
+git add src/version.json
+
+git add expo-package/yarn.lock
+git add native-package/yarn.lock
+
+npm version "$1" --force
+
+npm publish --tag="$tag"
+
+cd native-package
+npm publish --tag="$tag"
+
+
+cd ../expo-package
+npm publish --tag="$tag"
+
+git push --follow-tags