Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Iterable/react-native-sdk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.27
Choose a base ref
...
head repository: Iterable/react-native-sdk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Feb 12, 2021

  1. Copy the full SHA
    4f442e4 View commit details

Commits on Mar 1, 2021

  1. Copy the full SHA
    3888e61 View commit details

Commits on Mar 4, 2021

  1. Fix: Xcode 12 compatibility

    More details [here](facebook/react-native#29633 (comment)).
    
    Closes #112
    flochtililoch authored Mar 4, 2021
    Copy the full SHA
    0d9a7d0 View commit details
  2. Copy the full SHA
    28f8a9d View commit details

Commits on Mar 8, 2021

  1. Copy the full SHA
    544eefe View commit details
  2. Merge pull request #113 from flochtililoch/patch-1

    Fix: Xcode 12 compatibility
    roninopf authored Mar 8, 2021
    Copy the full SHA
    59f79ea View commit details

Commits on Mar 10, 2021

  1. Merge pull request #114 from rayzeller/f/add-set-read-for-message-to-…

    …android-bridge
    
    Add setReadForMessage to Android bridge
    roninopf authored Mar 10, 2021
    Copy the full SHA
    4d6c1bf View commit details

Commits on Mar 13, 2021

  1. Copy the full SHA
    f28ab3e View commit details

Commits on Mar 15, 2021

  1. Copy the full SHA
    397d20e View commit details

Commits on Apr 1, 2021

  1. Copy the full SHA
    ff790fd View commit details
  2. Merge pull request #116 from Iterable/MOB-2731-fix-auth-timeout

    [MOB-2731] add case for auth token retrieval timing out
    roninopf authored Apr 1, 2021
    Copy the full SHA
    f4d1d9e View commit details
  3. Merge pull request #120 from Iterable/MOB-2612-fix-dependency-require…

    …ments
    
    [MOB-2612] shift peer dependency to catch all and add react
    roninopf authored Apr 1, 2021
    Copy the full SHA
    5dbf6b5 View commit details
  4. version 1.1.0-beta2

    roninopf committed Apr 1, 2021
    Copy the full SHA
    13223a1 View commit details

Commits on Apr 7, 2021

  1. Copy the full SHA
    6f0dbf6 View commit details
  2. Copy the full SHA
    425510f View commit details

Commits on Apr 8, 2021

  1. Merge pull request #124 from Iterable/MOB-2815-update-integration-tes…

    …ting
    
    [MOB-2815] update integration testing to use 1.1.0-beta2
    roninopf authored Apr 8, 2021
    Copy the full SHA
    3b940de View commit details

Commits on Apr 15, 2021

  1. Fix sample app.

    tapashmajumder committed Apr 15, 2021
    Copy the full SHA
    4f44b59 View commit details

Commits on Apr 27, 2021

  1. Copy the full SHA
    22aab31 View commit details
  2. Copy the full SHA
    e56ca0a View commit details
  3. Merge pull request #131 from Iterable/tapash/mob-2862-ddl

    [MOB-2862] - Remove deferred deeplinking.
    tapashmajumder authored Apr 27, 2021
    Copy the full SHA
    7638565 View commit details

Commits on May 10, 2021

  1. Copy the full SHA
    5bb1bb1 View commit details
  2. Copy the full SHA
    2b4bc0a View commit details

Commits on May 11, 2021

  1. update yarn.lock for SDK

    roninopf committed May 11, 2021
    Copy the full SHA
    540f826 View commit details
  2. Merge pull request #136 from Iterable/merge-stable-into-master

    squash changes from stable for master
    roninopf authored May 11, 2021
    Copy the full SHA
    9d2da45 View commit details

Commits on May 27, 2021

  1. Copy the full SHA
    0528bae View commit details

Commits on May 28, 2021

  1. Copy the full SHA
    7a6a8b5 View commit details
  2. latest yarn.lock

    roninopf committed May 28, 2021
    Copy the full SHA
    c77c0f6 View commit details
  3. Copy the full SHA
    ce0b19f View commit details

Commits on Jun 8, 2021

  1. Copy the full SHA
    04f6507 View commit details
  2. Copy the full SHA
    384cea9 View commit details
  3. point to iOS SDK 6.3.1

    roninopf committed Jun 8, 2021
    Copy the full SHA
    e8184c7 View commit details
  4. Copy the full SHA
    36522f8 View commit details

Commits on Jun 14, 2021

  1. Copy the full SHA
    6b37d34 View commit details
  2. Copy the full SHA
    0e8cac5 View commit details

Commits on Jun 16, 2021

  1. Adding changes required for Android

    1. Bumping build.gradle to 3.3.1
    2. Modification to Serialization class to handle new optional parameters for CommerceItem
    Ayyanchira committed Jun 16, 2021
    Copy the full SHA
    f70f305 View commit details
  2. Copy the full SHA
    4d0bd36 View commit details
  3. Merge pull request #143 from Iterable/MOB-2923-trackpurchase-api

    [MOB-2923] trackpurchase api
    roninopf authored Jun 16, 2021
    Copy the full SHA
    cd6dc08 View commit details

Commits on Jun 17, 2021

  1. Merge pull request #138 from Iterable/dependabot/npm_and_yarn/SampleA…

    …pp/typescript/browserslist-4.16.6
    
    Bump browserslist from 4.16.4 to 4.16.6 in /SampleApp/typescript
    roninopf authored Jun 17, 2021
    Copy the full SHA
    d0ba022 View commit details
  2. Merge branch 'master' into MOB-2968-version-1.1.0

    # Conflicts:
    #	Iterable-React-Native-SDK.podspec
    #	android/build.gradle
    roninopf committed Jun 17, 2021
    Copy the full SHA
    86d82f2 View commit details
  3. update yarn.lock

    roninopf committed Jun 17, 2021
    Copy the full SHA
    e24b3f1 View commit details
  4. point to new android SDK

    roninopf committed Jun 17, 2021
    Copy the full SHA
    f15ec5c View commit details

Commits on Jun 21, 2021

  1. upgrade yarn.lock

    roninopf committed Jun 21, 2021
    Copy the full SHA
    7b615dc View commit details

Commits on Jun 23, 2021

  1. update yarn.lock

    roninopf committed Jun 23, 2021
    Copy the full SHA
    02c40d9 View commit details
  2. Copy the full SHA
    6bd8caa View commit details
  3. update sample app packages

    roninopf committed Jun 23, 2021
    Copy the full SHA
    d1552c0 View commit details

Commits on Jun 24, 2021

  1. Merge pull request #145 from Iterable/MOB-3027-fix-integration-test

    [MOB-3027] fix integration testing
    roninopf authored Jun 24, 2021
    Copy the full SHA
    1ea936e View commit details
  2. update yarn.lock

    roninopf committed Jun 24, 2021
    Copy the full SHA
    4b5bcf9 View commit details
  3. Merge branch 'master' into MOB-2805-sample-apps-fix

    # Conflicts:
    #	SampleApp/javascript/yarn.lock
    #	SampleApp/typescript/yarn.lock
    roninopf committed Jun 24, 2021
    Copy the full SHA
    954988c View commit details
  4. Merge pull request #146 from Iterable/MOB-2805-sample-apps-fix

    [MOB-2805] update sample app packages
    roninopf authored Jun 24, 2021
    Copy the full SHA
    1bf480c View commit details
  5. Copy the full SHA
    e0c6b5c View commit details
Showing 395 changed files with 29,808 additions and 33,007 deletions.
19 changes: 17 additions & 2 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -2,9 +2,7 @@ version: "2"
exclude_patterns:
- ".*/"
- "docs/"
- "integration-testing/"
- "**/node_modules/"
- "SampleApp/"
- "scripts/"
- "**/__mocks__/"
- "**/__tests__/"
@@ -21,3 +19,20 @@ exclude_patterns:
- "**/*.yml"
- "**/build.gradle"
- "**/AndroidManifest.xml"
plugins:
eslint:
enabled: true
editorconfig:
enabled: true
fixme:
enabled: true
git-legal:
enabled: true
shellcheck:
enabled: true
swiftlint:
enabled: true
tailor:
enabled: true
tslint:
enabled: true
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true

[*]

indent_style = space
indent_size = 2

end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
docs/
lib/
node_modules/
51 changes: 51 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
module.exports = {
root: true,
extends: [
'@react-native',
'plugin:react/recommended',
'plugin:react-native/all',
'prettier', // Disables ESLint rules that conflict with Prettier
],
rules: {
'react/react-in-jsx-scope': 'off',
},
overrides: [
{
files: ['*.ts', '*.tsx'],
plugins: ['@typescript-eslint/eslint-plugin', 'eslint-plugin-tsdoc'],
extends: [
'plugin:@typescript-eslint/recommended',
// We need more verbose typing to enable the below rule, but we should
// do this in the future
// 'plugin:@typescript-eslint/recommended-requiring-type-checking',
],
parser: '@typescript-eslint/parser',
parserOptions: {
project: true,
tsconfigRootDir: __dirname,
},
rules: {
'@typescript-eslint/no-var-requires': [
'error',
{ allow: ['/package\\.json$'] },
],
'@typescript-eslint/no-require-imports': [
'error',
{ allow: ['/package\\.json$'] },
],
'tsdoc/syntax': 'warn',
},
},
{
files: ['**/*.test.{js,ts,tsx}', '**/__mocks__/*', '**/__tests__/*'],
plugins: ['jest'],
env: {
jest: true,
},
rules: {
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/no-require-imports': 'off',
},
},
],
};
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.pbxproj -text
# specific for windows script files
*.bat text eol=crlf
27 changes: 27 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Setup
description: Setup Node.js and install dependencies

runs:
using: composite
steps:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version-file: .nvmrc

- name: Cache dependencies
id: yarn-cache
uses: actions/cache@v3
with:
path: |
**/node_modules
.yarn/install-state.gz
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }}
restore-keys: |
${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
${{ runner.os }}-yarn-
- name: Install dependencies
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: yarn install --immutable
shell: bash
157 changes: 157 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
name: CI
on:
push:
branches:
- main
pull_request:
branches:
- main
merge_group:
types:
- checks_requested

jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup
uses: ./.github/actions/setup

- name: Lint files
run: yarn lint

- name: Typecheck files
run: yarn typecheck

test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup
uses: ./.github/actions/setup

- name: Run unit tests
run: yarn test --maxWorkers=2 --coverage

build-library:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup
uses: ./.github/actions/setup

- name: Build package
run: yarn prepare

build-android:
runs-on: ubuntu-latest
env:
TURBO_CACHE_DIR: .turbo/android
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup
uses: ./.github/actions/setup

- name: Cache turborepo for Android
uses: actions/cache@v3
with:
path: ${{ env.TURBO_CACHE_DIR }}
key: ${{ runner.os }}-turborepo-android-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-turborepo-android-
- name: Check turborepo cache for Android
run: |
TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:android').cache.status")
if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
echo "turbo_cache_hit=1" >> $GITHUB_ENV
fi
- name: Install JDK
if: env.turbo_cache_hit != 1
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'

- name: Finalize Android SDK
if: env.turbo_cache_hit != 1
run: |
/bin/bash -c "yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses > /dev/null"
- name: Cache Gradle
if: env.turbo_cache_hit != 1
uses: actions/cache@v3
with:
path: |
~/.gradle/wrapper
~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('example/android/gradle/wrapper/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Build example for Android
env:
JAVA_OPTS: "-XX:MaxHeapSize=6g"
run: |
yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
build-ios:
runs-on: macos-14
env:
TURBO_CACHE_DIR: .turbo/ios
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup
uses: ./.github/actions/setup

- name: Cache turborepo for iOS
uses: actions/cache@v3
with:
path: ${{ env.TURBO_CACHE_DIR }}
key: ${{ runner.os }}-turborepo-ios-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-turborepo-ios-
- name: Check turborepo cache for iOS
run: |
TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:ios').cache.status")
if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
echo "turbo_cache_hit=1" >> $GITHUB_ENV
fi
- name: Cache cocoapods
if: env.turbo_cache_hit != 1
id: cocoapods-cache
uses: actions/cache@v3
with:
path: |
**/ios/Pods
key: ${{ runner.os }}-cocoapods-${{ hashFiles('example/ios/Podfile.lock') }}
restore-keys: |
${{ runner.os }}-cocoapods-
- name: Install cocoapods
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
run: |
cd example/ios
pod install
env:
NO_FLIPPER: 1

- name: Build example for iOS
run: |
yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
38 changes: 0 additions & 38 deletions .github/workflows/integration-test.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/test-and-publish.yml

This file was deleted.

Loading