diff --git a/.github/workflows/app_prod.yaml b/.github/workflows/app_prod.yaml index 072492e7..d6b0bf74 100644 --- a/.github/workflows/app_prod.yaml +++ b/.github/workflows/app_prod.yaml @@ -207,7 +207,7 @@ jobs: run: | pod install --repo-update working-directory: source/examples/Basic/ios - + - name: Build resolve Swift dependencies run: | xcodebuild -resolvePackageDependencies -workspace ios/Basic.xcworkspace -scheme BasicProduction -configuration Release diff --git a/.github/workflows/app_stg.yaml b/.github/workflows/app_stg.yaml index 9370a8ea..776e2a16 100644 --- a/.github/workflows/app_stg.yaml +++ b/.github/workflows/app_stg.yaml @@ -46,7 +46,7 @@ jobs: cache: gradle distribution: temurin java-version: 17 - + - name: Install Google API python client run: | pip install google-api-python-client diff --git a/android/build.gradle b/android/build.gradle index c96c2d0c..d6439042 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -85,8 +85,8 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - playImplementation "com.namiml:sdk-android:3.2.3.1" - amazonImplementation "com.namiml:sdk-amazon:3.2.3.1" + playImplementation "com.namiml:sdk-android:3.2.4-beta.01" + amazonImplementation "com.namiml:sdk-amazon:3.2.4-beta.01" implementation "com.facebook.react:react-native:+" // From node_modules coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5" diff --git a/android/src/main/java/com/nami/reactlibrary/NamiBridgeModule.kt b/android/src/main/java/com/nami/reactlibrary/NamiBridgeModule.kt index 2b57c1e6..cc97b79e 100644 --- a/android/src/main/java/com/nami/reactlibrary/NamiBridgeModule.kt +++ b/android/src/main/java/com/nami/reactlibrary/NamiBridgeModule.kt @@ -106,7 +106,7 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) : } else { Arguments.createArray() } - val settingsList = mutableListOf("extendedClientInfo:react-native:3.2.3") + val settingsList = mutableListOf("extendedClientInfo:react-native:3.2.4") namiCommandsReact?.toArrayList()?.filterIsInstance()?.let { commandsFromReact -> settingsList.addAll(commandsFromReact) } diff --git a/android/src/main/java/com/nami/reactlibrary/NamiCampaignManagerBridge.kt b/android/src/main/java/com/nami/reactlibrary/NamiCampaignManagerBridge.kt index c0d25db1..00ed5c92 100755 --- a/android/src/main/java/com/nami/reactlibrary/NamiCampaignManagerBridge.kt +++ b/android/src/main/java/com/nami/reactlibrary/NamiCampaignManagerBridge.kt @@ -301,7 +301,7 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) : array.pushMap(campaignToReadableMap(campaign)) } promise.resolve(array) - } + } } @ReactMethod diff --git a/android/src/main/java/com/nami/reactlibrary/NamiPaywallManagerBridgeModule.kt b/android/src/main/java/com/nami/reactlibrary/NamiPaywallManagerBridgeModule.kt index f13b5df6..e7e96b3d 100644 --- a/android/src/main/java/com/nami/reactlibrary/NamiPaywallManagerBridgeModule.kt +++ b/android/src/main/java/com/nami/reactlibrary/NamiPaywallManagerBridgeModule.kt @@ -222,7 +222,7 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) : @ReactMethod fun setProductDetails(productDetails: String, allowOffers: Boolean) { - NamiPaywallManager.setProductDetails(productDetails, allowOffers = false) + NamiPaywallManager.setProductDetails(productDetails, allowOffers = allowOffers) } @ReactMethod diff --git a/examples/Basic/index.js b/examples/Basic/index.js index 25d36445..35ae5c97 100644 --- a/examples/Basic/index.js +++ b/examples/Basic/index.js @@ -65,9 +65,9 @@ const Root = () => { setIsConfigurationComplete(true); checkSdkConfigured(); } - + initStoreConnection(); - + // eslint-disable-next-line @typescript-eslint/no-empty-function return () => {}; } diff --git a/examples/TestNamiTV/index.js b/examples/TestNamiTV/index.js index b071dcf6..99349e28 100644 --- a/examples/TestNamiTV/index.js +++ b/examples/TestNamiTV/index.js @@ -25,15 +25,15 @@ const Root = () => { const result = await Nami.configure(configDict); if(result.success){ setIsConfigurationComplete(true); - + if (Platform.constants.Manufacturer === 'Amazon') { - NamiPaywallManager.setProductDetails(getAmazonProducts(), false); + NamiPaywallManager.setProductDetails(getAmazonProducts(), true); } } - + // eslint-disable-next-line @typescript-eslint/no-empty-function return () => {}; - + } configureNami(); }, []); diff --git a/ios/Nami.m b/ios/Nami.m index 975b29fa..8d989511 100644 --- a/ios/Nami.m +++ b/ios/Nami.m @@ -50,7 +50,7 @@ @implementation NamiBridge (RCTExternModule) } // Start commands with header iformation for Nami to let them know this is a React client. - NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.2.3"]]; + NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.2.4"]]; // Add additional namiCommands app may have sent in. NSObject *appCommandStrings = configDict[@"namiCommands"]; diff --git a/ios/NamiCampaignManagerBridge.swift b/ios/NamiCampaignManagerBridge.swift index dbaaf15a..b4da8c53 100644 --- a/ios/NamiCampaignManagerBridge.swift +++ b/ios/NamiCampaignManagerBridge.swift @@ -82,9 +82,9 @@ class RNNamiCampaignManager: RCTEventEmitter { case .slide_change: actionString = "SLIDE_CHANGE" case .nami_collapsible_drawer_open: - actionString = "COLLAPSIBLE_DRAWER_OPEN" + actionString = "COLLAPSIBLE_DRAWER_OPEN" case .nami_collapsible_drawer_close: - actionString = "COLLAPSIBLE_DRAWER_CLOSE" + actionString = "COLLAPSIBLE_DRAWER_CLOSE" case .video_play: actionString = "VIDEO_STARTED" case .video_pause: @@ -275,7 +275,7 @@ class RNNamiCampaignManager: RCTEventEmitter { NamiCampaignManager.refresh { campaigns in let dictionaries = campaigns.map { campaign in self.campaignInToDictionary(campaign) } resolve(dictionaries) - } + } } @objc(registerAvailableCampaignsHandler) diff --git a/package.json b/package.json index 004f5227..9914ac89 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-nami-sdk", - "version": "3.2.3-2", + "version": "3.2.4-beta.1", "description": "React Native Module for Nami - Easy subscriptions & in-app purchases, with powerful built-in paywalls and A/B testing.", "main": "index.ts", "types": "index.d.ts", diff --git a/react-native-nami-sdk.podspec b/react-native-nami-sdk.podspec index 8dbbc9b7..9d7c74f6 100644 --- a/react-native-nami-sdk.podspec +++ b/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.2.3' + s.dependency 'Nami', '3.2.4-beta.01' s.dependency 'React' end