react-native-nami-sdk 3.0.10 → 3.0.12

package/.github/workflows/app_prod.yaml

@@ -201,116 +201,116 @@ jobs:
           env:
             APPSTORE_API_KEY_ID: "${{ secrets.APPSTORE_API_KEY_ID }}"
             APPSTORE_ISSUER_ID: "${{ secrets.APPSTORE_ISSUER_ID }}"
-      build-tvos-prod:
-        name: Build TestNamiTV tvOS PROD
-        permissions:
-          actions: write
-          contents: write
-          id-token: write
-        runs-on: macos-12
-        timeout-minutes: 40
-        steps:
-          - uses: actions/setup-node@v3
-            with:
-              node-version: "16"
-
-          - name: "Checkout ${{ inputs.ref }}"
-            uses: actions/checkout@v2
-            with:
-              path: source
-              ref: "${{ inputs.ref }}"
-
-          - name: Checkout appstoreconnect-build-tools
-            uses: actions/checkout@v2
-            with:
-              path: appstoreconnect-build-tools
-              ref: main
-              repository: namiml/appstoreconnect-build-tools
-
-          - name: Set up Python
-            uses: actions/setup-python@v1
-            with:
-              python-version: "3.10"
-
-          - name: Get expected build number
-            run: |
-              pip3 install requests
-              pip3 install pydantic
-              pip3 install cryptography
-              pip3 install PyJWT
-              echo "1.0" > $RUNNER_TEMP/.current_version
-              export CURRENT_VERSION=`cat $RUNNER_TEMP/.current_version`
-              python3 get_next_build.py com.namiml.stg.testreactnative --prerelease --platform=TV_OS > $RUNNER_TEMP/.next_build_number
-            working-directory: appstoreconnect-build-tools
-            env:
-              APPSTORE_API_KEY_ID: "${{ secrets.APPSTORE_API_KEY_ID }}"
-              APPSTORE_API_PRIVATE_KEY: "${{ secrets.APPSTORE_API_PRIVATE_KEY }}"
-              APPSTORE_ISSUER_ID: "${{ secrets.APPSTORE_ISSUER_ID }}"
-
-          - name: Install Apple Certificate
-            uses: apple-actions/import-codesign-certs@v1
-            with:
-              p12-file-base64: "${{ secrets.IOS_P12_BASE64 }}"
-              p12-password: "${{ secrets.IOS_CERTIFICATE_PASSWORD }}"
-
-          - name: Install the provisioning profile
-            run: |
-              PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
-              echo -n "$PROVISIONING_CERTIFICATE_BASE64" | base64 --decode --output $PP_PATH
-              mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
-              cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
-            env:
-              PROVISIONING_CERTIFICATE_BASE64: "${{ secrets.IOS_MOBILE_PROVISION_BASE64_TEST_REACT_TVOS_PROD }}"
-
-          - name: Store App Store Private Key
-            run: |
-              mkdir ~/.private_keys
-              echo '${{ secrets.APPSTORE_API_PRIVATE_KEY }}' > ~/.private_keys/AuthKey_'${{ secrets.APPSTORE_API_KEY_ID }}'.p8
-
-          - name: Update ExportOptions.plist
-            run: |
-              sed -i '' -e "s/APPSTORE_TEAM_ID/${{ secrets.APPSTORE_TEAM_ID }}/" ExportOptions.plist
-              sed -i '' -e "s/APPSTORE_PROVISIONING_PROFILE_UUID/${{ secrets.APPSTORE_PROV_PROFILE_UUID_TEST_REACT_TVOS_PROD }}/g" ExportOptions.plist
-            working-directory: source/examples/TestNamiTV/ios
-
-          - name: Adjust version & build number
-            run: |-
-              export CURRENT_VERSION=`cat $RUNNER_TEMP/.current_version`
-              export BUILD_NUMBER=`cat $RUNNER_TEMP/.next_build_number`
-              sed -i '' -e "s/CURRENT_PROJECT_VERSION = 1/CURRENT_PROJECT_VERSION = $BUILD_NUMBER/" ios/Basic.xcodeproj/project.pbxproj
-              sed -i '' -e "s/MARKETING_VERSION = 1.0/MARKETING_VERSION = $CURRENT_VERSION/" ios/Basic.xcodeproj/project.pbxproj
-              sed -i '' -e "s/<string>1<\/string>/<string>$BUILD_NUMBER<\/string>/"  ios/Info-PROD.plist
-            working-directory: source/examples/TestNamiTV
-
-          - name: Install test app dependencies
-            run: |
-              yarn install
-            working-directory: source/examples/TestNamiTV
-
-          - name: Install test tvOS dependencies
-            run: |
-              RCT_NEW_ARCH_ENABLED=0 SWIFT_VERSION=5 pod install
-            working-directory: source/examples/TestNamiTV/ios
-
-          - name: Build resolve Swift dependencies
-            run: |
-              xcodebuild -resolvePackageDependencies -workspace ios/Basic.xcworkspace -scheme Basic-tvOS-PROD -configuration Release
-            working-directory: source/examples/TestNamiTV
-
-          - name: Build xArchive
-            run: |
-              xcodebuild -workspace ios/Basic.xcworkspace -scheme Basic-tvOS-PROD -configuration Release DEVELOPMENT_TEAM='${{ secrets.APPSTORE_TEAM_ID }}' -sdk 'appletvos' -destination 'generic/platform=tvOS' -archivePath build-output/app-prod.xcarchive PROVISIONING_PROFILE='${{ secrets.APPSTORE_PROV_PROFILE_UUID_TEST_REACT_TVOS_PROD }}' clean archive CODE_SIGN_IDENTITY='${{ secrets.CODE_SIGNING_IDENTITY }}'
-            working-directory: source/examples/TestNamiTV
-
-          - name: Export IPA
-            run: |
-              xcodebuild -exportArchive -archivePath build-output/app-prod.xcarchive -exportPath build-output/tvos-prod -exportOptionsPlist ios/ExportOptions.plist
-            working-directory: source/examples/TestNamiTV
-
-          - name: Upload app to TestFlight
-            run: |
-              xcrun altool --upload-app --type tvos --file build-output/tvos-prod/Basic-tvOS-PROD.ipa --apiKey $APPSTORE_API_KEY_ID --apiIssuer $APPSTORE_ISSUER_ID
-            working-directory: source/examples/TestNamiTV
-            env:
-              APPSTORE_API_KEY_ID: "${{ secrets.APPSTORE_API_KEY_ID }}"
-              APPSTORE_ISSUER_ID: "${{ secrets.APPSTORE_ISSUER_ID }}"
+  build-tvos-prod:
+    name: Build TestNamiTV tvOS PROD
+    permissions:
+      actions: write
+      contents: write
+      id-token: write
+    runs-on: macos-12
+    timeout-minutes: 40
+    steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+
+      - name: "Checkout ${{ inputs.ref }}"
+        uses: actions/checkout@v2
+        with:
+          path: source
+          ref: "${{ inputs.ref }}"
+
+      - name: Checkout appstoreconnect-build-tools
+        uses: actions/checkout@v2
+        with:
+          path: appstoreconnect-build-tools
+          ref: main
+          repository: namiml/appstoreconnect-build-tools
+
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: "3.10"
+
+      - name: Get expected build number
+        run: |
+          pip3 install requests
+          pip3 install pydantic
+          pip3 install cryptography
+          pip3 install PyJWT
+          echo "1.0" > $RUNNER_TEMP/.current_version
+          export CURRENT_VERSION=`cat $RUNNER_TEMP/.current_version`
+          python3 get_next_build.py com.namiml.stg.testreactnative --prerelease --platform=TV_OS > $RUNNER_TEMP/.next_build_number
+        working-directory: appstoreconnect-build-tools
+        env:
+          APPSTORE_API_KEY_ID: "${{ secrets.APPSTORE_API_KEY_ID }}"
+          APPSTORE_API_PRIVATE_KEY: "${{ secrets.APPSTORE_API_PRIVATE_KEY }}"
+          APPSTORE_ISSUER_ID: "${{ secrets.APPSTORE_ISSUER_ID }}"
+
+      - name: Install Apple Certificate
+        uses: apple-actions/import-codesign-certs@v1
+        with:
+          p12-file-base64: "${{ secrets.IOS_P12_BASE64 }}"
+          p12-password: "${{ secrets.IOS_CERTIFICATE_PASSWORD }}"
+
+      - name: Install the provisioning profile
+        run: |
+          PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
+          echo -n "$PROVISIONING_CERTIFICATE_BASE64" | base64 --decode --output $PP_PATH
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
+        env:
+          PROVISIONING_CERTIFICATE_BASE64: "${{ secrets.IOS_MOBILE_PROVISION_BASE64_TEST_REACT_TVOS_PROD }}"
+
+      - name: Store App Store Private Key
+        run: |
+          mkdir ~/.private_keys
+          echo '${{ secrets.APPSTORE_API_PRIVATE_KEY }}' > ~/.private_keys/AuthKey_'${{ secrets.APPSTORE_API_KEY_ID }}'.p8
+
+      - name: Update ExportOptions.plist
+        run: |
+          sed -i '' -e "s/APPSTORE_TEAM_ID/${{ secrets.APPSTORE_TEAM_ID }}/" ExportOptions.plist
+          sed -i '' -e "s/APPSTORE_PROVISIONING_PROFILE_UUID/${{ secrets.APPSTORE_PROV_PROFILE_UUID_TEST_REACT_TVOS_PROD }}/g" ExportOptions.plist
+        working-directory: source/examples/TestNamiTV/ios
+
+      - name: Adjust version & build number
+        run: |-
+          export CURRENT_VERSION=`cat $RUNNER_TEMP/.current_version`
+          export BUILD_NUMBER=`cat $RUNNER_TEMP/.next_build_number`
+          sed -i '' -e "s/CURRENT_PROJECT_VERSION = 1/CURRENT_PROJECT_VERSION = $BUILD_NUMBER/" ios/Basic.xcodeproj/project.pbxproj
+          sed -i '' -e "s/MARKETING_VERSION = 1.0/MARKETING_VERSION = $CURRENT_VERSION/" ios/Basic.xcodeproj/project.pbxproj
+          sed -i '' -e "s/<string>1<\/string>/<string>$BUILD_NUMBER<\/string>/"  ios/Info-PROD.plist
+        working-directory: source/examples/TestNamiTV
+
+      - name: Install test app dependencies
+        run: |
+          yarn install
+        working-directory: source/examples/TestNamiTV
+
+      - name: Install test tvOS dependencies
+        run: |
+          RCT_NEW_ARCH_ENABLED=0 SWIFT_VERSION=5 pod install
+        working-directory: source/examples/TestNamiTV/ios
+
+      - name: Build resolve Swift dependencies
+        run: |
+          xcodebuild -resolvePackageDependencies -workspace ios/Basic.xcworkspace -scheme Basic-tvOS-PROD -configuration Release
+        working-directory: source/examples/TestNamiTV
+
+      - name: Build xArchive
+        run: |
+          xcodebuild -workspace ios/Basic.xcworkspace -scheme Basic-tvOS-PROD -configuration Release DEVELOPMENT_TEAM='${{ secrets.APPSTORE_TEAM_ID }}' -sdk 'appletvos' -destination 'generic/platform=tvOS' -archivePath build-output/app-prod.xcarchive PROVISIONING_PROFILE='${{ secrets.APPSTORE_PROV_PROFILE_UUID_TEST_REACT_TVOS_PROD }}' clean archive CODE_SIGN_IDENTITY='${{ secrets.CODE_SIGNING_IDENTITY }}'
+        working-directory: source/examples/TestNamiTV
+
+      - name: Export IPA
+        run: |
+          xcodebuild -exportArchive -archivePath build-output/app-prod.xcarchive -exportPath build-output/tvos-prod -exportOptionsPlist ios/ExportOptions.plist
+        working-directory: source/examples/TestNamiTV
+
+      - name: Upload app to TestFlight
+        run: |
+          xcrun altool --upload-app --type tvos --file build-output/tvos-prod/Basic-tvOS-PROD.ipa --apiKey $APPSTORE_API_KEY_ID --apiIssuer $APPSTORE_ISSUER_ID
+        working-directory: source/examples/TestNamiTV
+        env:
+          APPSTORE_API_KEY_ID: "${{ secrets.APPSTORE_API_KEY_ID }}"
+          APPSTORE_ISSUER_ID: "${{ secrets.APPSTORE_ISSUER_ID }}"

package/.github/workflows/app_stg.yaml

@@ -127,7 +127,7 @@ jobs:
           pip3 install PyJWT
           echo "1.0" > $RUNNER_TEMP/.current_version
           export CURRENT_VERSION=`cat $RUNNER_TEMP/.current_version`
-          python3 get_next_build.py com.namiml.stg.testreactnative --prerelease --version=$CURRENT_VERSION > $RUNNER_TEMP/.next_build_number
+          python3 get_next_build.py com.namiml.stg.testreactnative --prerelease --version=$CURRENT_VERSION --platform=IOS > $RUNNER_TEMP/.next_build_number
         working-directory: appstoreconnect-build-tools
         env:
           APPSTORE_API_KEY_ID: "${{ secrets.APPSTORE_API_KEY_ID }}"

package/android/build.gradle

@@ -36,17 +36,18 @@ buildscript {
     }
 }
 android {
-    compileSdkVersion 33
+    compileSdkVersion 32
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
     defaultConfig {
-        minSdkVersion 25
-        targetSdkVersion 33
+        minSdkVersion 22
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
     lintOptions {
         abortOnError false
@@ -81,9 +82,10 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     implementation 'com.github.jeziellago:compose-markdown:0.3.0'
-    implementation "com.namiml:sdk-android:3.0.11"
+    implementation "com.namiml:sdk-android:3.0.13"
 
     implementation 'com.facebook.react:react-native:+'  // From node_modules
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
 }
 def configureReactNativePom(def pom) {
     def packageJson = new JsonSlurper().parseText(file('../package.json').text)

package/android/src/main/java/com/nami/reactlibrary/NamiBridgeModule.kt

@@ -114,7 +114,7 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
             } else {
                 Arguments.createArray()
             }
-        val settingsList = mutableListOf("extendedClientInfo:react-native:3.0.10")
+        val settingsList = mutableListOf("extendedClientInfo:react-native:3.0.12")
         namiCommandsReact?.toArrayList()?.filterIsInstance<String>()?.let { commandsFromReact ->
             settingsList.addAll(commandsFromReact)
         }

package/ios/Nami.m

@@ -52,7 +52,7 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict completion: (RCTResponse
         }
 
         // Start commands with header iformation for Nami to let them know this is a React client.
-        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.0.10"]];
+        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.0.12"]];
 
         // Add additional namiCommands app may have sent in.
         NSObject *appCommandStrings = configDict[@"namiCommands"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.0.10",
+  "version": "3.0.12",
   "description": "React Native Module for Nami - Easy subscriptions & in-app purchases, with powerful built-in paywalls and A/B testing.",
   "main": "index.js",
   "scripts": {
@@ -17,6 +17,7 @@
     "in-app-purchase",
     "ios",
     "ipados",
+    "tvos",
     "paywall",
     "react-native",
     "storekit",

package/react-native-nami-sdk.podspec

@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,swift}"
   s.requires_arc = true
 
-  s.dependency 'Nami', '3.0.13'
+  s.dependency 'Nami', '3.0.14'
   s.dependency 'React'
 
 end