Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.2.4-beta.1 #350

Merged
merged 1 commit into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/app_prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/app_stg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String>()?.let { commandsFromReact ->
settingsList.addAll(commandsFromReact)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
array.pushMap(campaignToReadableMap(campaign))
}
promise.resolve(array)
}
}
}

@ReactMethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/Basic/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ const Root = () => {
setIsConfigurationComplete(true);
checkSdkConfigured();
}

initStoreConnection();

// eslint-disable-next-line @typescript-eslint/no-empty-function
return () => {};
}
Expand Down
8 changes: 4 additions & 4 deletions examples/TestNamiTV/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}, []);
Expand Down
2 changes: 1 addition & 1 deletion ios/Nami.m
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
6 changes: 3 additions & 3 deletions ios/NamiCampaignManagerBridge.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -275,7 +275,7 @@ class RNNamiCampaignManager: RCTEventEmitter {
NamiCampaignManager.refresh { campaigns in
let dictionaries = campaigns.map { campaign in self.campaignInToDictionary(campaign) }
resolve(dictionaries)
}
}
}

@objc(registerAvailableCampaignsHandler)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion react-native-nami-sdk.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading