react-native-iap 9.0.0-beta7 → 9.0.0-rc.2

package/README.md

@@ -5,23 +5,36 @@
 
 [![Download](http://img.shields.io/npm/dm/react-native-iap.svg?style=flat-square)](https://npmjs.org/package/react-native-iap)
 [![CI](https://github.com/dooboolab/react-native-iap/actions/workflows/ci.yml/badge.svg)](https://github.com/dooboolab/react-native-iap/actions/workflows/ci.yml)
-[![document](https://github.com/dooboolab/react-native-iap/actions/workflows/deploy-document.yml/badge.svg)](https://github.com/dooboolab/react-native-iap/actions/workflows/deploy-document.yml)
+[![document](https://github.com/dooboolab/react-native-iap/actions/workflows/deploy-documentation.yml/badge.svg)](https://github.com/dooboolab/react-native-iap/actions/workflows/deploy-documentation.yml)
 [![License](https://img.shields.io/npm/l/react-native-iap.svg)](https://npmjs.org/package/react-native-iap)
 [![Vulnerabilities](https://img.shields.io/snyk/vulnerabilities/github/dooboolab/react-native-iap.svg)](https://github.com/dooboolab/react-native-iap)
 [![Issue Opened](https://img.shields.io/opencollective/all/react-native-iap.svg)](https://opencollective.com/react-native-iap#backers)
 [![Issue Opened](https://img.shields.io/github/issues/dooboolab/react-native-iap.svg)](https://github.com/dooboolab/react-native-iap/issues)
 [![Issue Closed](https://img.shields.io/github/issues-closed/dooboolab/react-native-iap.svg)](https://github.com/dooboolab/react-native-iap/issues?q=is%3Aissue+is%3Aclosed)
 [![PR Opened](https://img.shields.io/github/issues-pr/dooboolab/react-native-iap.svg)](https://github.com/dooboolab/react-native-iap/pulls)
-[![PR Closed](https://img.shields.io/github/issues-pr-closed/dooboolab/react-native-iap.svg)](https://github.com/dooboolab/react-native-iap/pulls?q=is%3Apr+is%3Aclosed) [![Greenkeeper badge](https://badges.greenkeeper.io/dooboolab/react-native-iap.svg)](https://greenkeeper.io/)
+[![PR Closed](https://img.shields.io/github/issues-pr-closed/dooboolab/react-native-iap.svg)](https://github.com/dooboolab/react-native-iap/pulls?q=is%3Apr+is%3Aclosed)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdooboolab%2Freact-native-iap.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdooboolab%2Freact-native-iap?ref=badge_shield)
 
 ## Documentation
 
 Published in [website](https://react-native-iap.dooboolab.com).
 
+## Our maintainers
+
+Please [fund the project](https://opencollective.com/react-native-iap) if you are willing the maintainers to make the repository sustainable.
+
+- [andresesfm](https://github.com/andresesfm)
+- [jeremybarbet](https://github.com/jeremybarbet)
+
+> The fund goes to maintainers.
+
+### Supporter
+
+- [hyochan](https://github.com/hyochan)
+
 ## Announcement
 
-- Version `9.0.0` is currently in release candidate. The module migrates android sdk to [play billing library v5](https://qonversion.io/blog/google-play-billing-library-5-0) and iOS sdk to [storekit2](https://developer.apple.com/videos/play/wwdc2021/10114). Our core maintainer [andresesfm](https://github.com/andresesfm) is working hard on this. Please [fund the project](https://opencollective.com/react-native-iap) if you wish to support his effort. The fund goes to maintainers. To try the earlier version please use the `next` package.
+- Version `9.0.0` is currently in release candidate. The module migrates android sdk to [play billing library v5](https://qonversion.io/blog/google-play-billing-library-5-0) and iOS sdk to [storekit2](https://developer.apple.com/videos/play/wwdc2021/10114). Our core maintainers [andresesfm](https://github.com/andresesfm) and [jeremybarbet](https://github.com/jeremybarbet) are working hard on this.
 
   ```
   yarn add react-native-iap@next
@@ -141,25 +154,9 @@ If you're looking for a module going further than react-native-iap, we recommend
 
 - Please refer to [Blog][blog-config-steps].
 
-## [Deprecated README][readme-deprecated]
-
-- If you are using `react-native-iap@^2.*`, please follow the above README.
-
-## Usage
-
-You can look in the [`RNIapExample/`][example] folder to try the example.
-
-NOTE: To run `RNIapExample` on Android use the variant flag as follows:
-
-```
-yarn android --variant=MY_VARIANT
-```
-
-where `MY_VARIANT` is `PlayDebug` or `AmazonDebug`
-
-Below is basic implementation which is also provided in `RNIapExample` project.
+## Example
 
-If you want more advanced one please refer to [dooboolab.com/sponsor.tsx](https://github.com/hyochan/dooboolab.com/blob/main/src/components/pages/Sponsor.tsx)
+Follow [this guide](./IapExample/README.md) to get the example running.
 
 ## Sponsoring
 

package/RNIap.podspec

@@ -1,23 +1,38 @@
-require 'json'
-package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+folly_version = '2021.06.28.00-v2'
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
-  s.name          = "RNIap"
-  s.version       = package['version']
-  s.summary       = package['description']
-  s.homepage      = "https://github.com/dooboolab/react-native-iap"
-  s.license       = "MIT"
-  s.author        = package['author']
-  s.platforms     = { :ios => "9.0", :tvos => "9.0" }
-  s.source        = { :git => "https://github.com/dooboolab/react-native-iap.git", :tag => "#{s.version}" }
-  s.source_files  = "ios/*.{h,m,swift}"
-  s.script_phase = {
-    :name => 'Copy Swift Header',
-    :script => 'ditto "${DERIVED_SOURCES_DIR}/${PRODUCT_MODULE_NAME}-Swift.h" "${PODS_ROOT}/Headers/Public/${PRODUCT_MODULE_NAME}/${PRODUCT_MODULE_NAME}-Swift.h"',
-    :execution_position => :after_compile 
-  }
-  s.swift_version = "4.2"
+  s.name         = "RNIap"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => "10.0" }
+  s.source       = { :git => "https://github.com/dooboolab/react-native-iap.git", :tag => "#{s.version}" }
+
+  s.source_files = "ios/*.{h,m,mm,swift}"
+
   s.requires_arc  = true
 
-  s.dependency 'React-Core'
+  s.dependency "React-Core"
+
+  # Don't install the dependencies when we run `pod install` in the old architecture.
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+    s.pod_target_xcconfig    = {
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    }
+
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly", folly_version
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
+  end
 end

package/android/build.gradle

@@ -1,91 +1,190 @@
 buildscript {
-  ext.DEFAULT_KOTLIN_VERSION = '1.7.10'
-  ext.safeExtGet={prop, fallback-> 
-    return rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-  }
-    repositories {
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlinVersion = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["RNIap_kotlinVersion"]
+
+  repositories {
     google()
     mavenCentral()
   }
 
-
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.2.2'
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion',DEFAULT_KOTLIN_VERSION)}"
+    classpath "com.android.tools.build:gradle:4.2.2"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
   }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") &&  rootProject.getProperty("newArchEnabled") == "true"
+}
 
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
-def DEFAULT_COMPILE_SDK_VERSION = 30
-def DEFAULT_BUILD_TOOLS_VERSION = "30.0.2"
-def DEFAULT_MIN_SDK_VERSION = 16
-def DEFAULT_TARGET_SDK_VERSION = 30
-def DEFAULT_PLAY_SERVICES_VERSION = "18.1.0"
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
+}
+
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["RNIap_" + name]
+}
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["RNIap_" + name]).toInteger()
+}
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", DEFAULT_COMPILE_SDK_VERSION)
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
-    minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-    targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
-    versionCode 3
-    versionName "3.0.0"
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+  }
+
+  buildTypes {
+    release {
+      minifyEnabled false
+    }
   }
+
   lintOptions {
     abortOnError false
+    disable "GradleCompatible"
   }
+
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
   flavorDimensions "store"
+
   productFlavors {
-    amazon{
+    amazon {
       dimension "store"
     }
-    play{
+
+    play {
       dimension "store"
     }
   }
+
   testOptions {
     unitTests.returnDefaultValues = true
   }
 }
 
 repositories {
-  maven {
-            // All of React Native (JS, Android binaries) is installed from npm
-            url "$rootDir/../node_modules/react-native/android"
-        }
-  google()
   mavenCentral()
+  google()
+
+  def found = false
+  def defaultDir = null
+  def androidSourcesName = "React Native sources"
+
+  if (rootProject.ext.has("reactNativeAndroidRoot")) {
+    defaultDir = rootProject.ext.get("reactNativeAndroidRoot")
+  } else {
+    defaultDir = new File(
+      projectDir,
+      "/../../../node_modules/react-native/android"
+    )
+  }
+
+  if (defaultDir.exists()) {
+    maven {
+      url defaultDir.toString()
+      name androidSourcesName
+    }
+
+    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
+    found = true
+  } else {
+    def parentDir = rootProject.projectDir
+
+    1.upto(5, {
+      if (found) return true
+      parentDir = parentDir.parentFile
+
+      def androidSourcesDir = new File(
+        parentDir,
+        "node_modules/react-native"
+      )
+
+      def androidPrebuiltBinaryDir = new File(
+        parentDir,
+        "node_modules/react-native/android"
+      )
+
+      if (androidPrebuiltBinaryDir.exists()) {
+        maven {
+          url androidPrebuiltBinaryDir.toString()
+          name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
+        found = true
+      } else if (androidSourcesDir.exists()) {
+        maven {
+          url androidSourcesDir.toString()
+          name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
+        found = true
+      }
+    })
+  }
+
+  if (!found) {
+    throw new GradleException(
+      "${project.name}: unable to locate React Native android sources. " +
+      "Ensure you have you installed React Native as a dependency in your project and try again."
+    )
+  }
 }
 
+def kotlinVersion = getExtOrDefault("kotlinVersion")
+def playServicesVersion = getExtOrDefault("playServicesVersion")
+def supportLibVersion = getExtOrDefault("supportLibVersion")
+def androidXVersion = getExtOrDefault("androidXVersion")
+def androidXAnnotation = getExtOrDefault("androidXAnnotation")
+def androidXBrowser = getExtOrDefault("androidXBrowser")
+
 dependencies {
-  implementation 'com.facebook.react:react-native:+'
-  testImplementation 'junit:junit:4.13.1'
+  implementation "com.facebook.react:react-native:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+
+  testImplementation "junit:junit:4.13.2"
   testImplementation "io.mockk:mockk:1.12.4"
-  playImplementation 'com.android.billingclient:billing:5.0.0'
-  def playServicesVersion = safeExtGet('playServicesVersion', DEFAULT_PLAY_SERVICES_VERSION)
+
+  playImplementation "com.android.billingclient:billing-ktx:5.0.0"
   playImplementation "com.google.android.gms:play-services-base:$playServicesVersion"
-  amazonImplementation fileTree(dir: 'libs', include: ['*.jar'])
 
-  def supportLibVersion = safeExtGet('supportLibVersion', safeExtGet('supportVersion', null))
-  def androidXVersion = safeExtGet('androidXVersion', null)
+  amazonImplementation fileTree(dir: "libs", include: ["*.jar"])
+
   if (supportLibVersion && androidXVersion == null) {
     implementation "com.android.support:support-annotations:$supportLibVersion"
     implementation "com.android.support:customtabs:$supportLibVersion"
   } else {
     def defaultAndroidXVersion = "1.2.0"
+
     if (androidXVersion == null) {
       androidXVersion = defaultAndroidXVersion
     }
-    def androidXAnnotation = safeExtGet('androidXAnnotation', androidXVersion)
-    def androidXBrowser = safeExtGet('androidXBrowser', androidXVersion)
-    implementation "androidx.annotation:annotation:$androidXAnnotation"
-    implementation "androidx.browser:browser:$androidXBrowser"
+
+    def annotationVersion = androidXAnnotation ? androidXAnnotation : androidXVersion
+    def browserVersion = androidXBrowser ? androidXBrowser : androidXVersion
+
+    implementation "androidx.annotation:annotation:$annotationVersion"
+    implementation "androidx.browser:browser:$browserVersion"
+  }
+}
+
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "RNIap"
+    codegenJavaPackageName = "com.reactnativeiap"
   }
 }

package/android/gradle.properties

@@ -1,2 +1,10 @@
+RNIap_kotlinVersion=1.7.0
+RNIap_minSdkVersion=21
+RNIap_targetSdkVersion=31
+RNIap_compileSdkVersion=31
+RNIap_buildToolsVersion=30.0.2
+RNIap_ndkversion=21.4.7075529
+RNIap_playServicesVersion=17.6.0
+
 android.useAndroidX=true
 android.enableJetifier=true

package/android/src/amazon/java/com/dooboolab/RNIap/RNIapAmazonModule.kt

@@ -69,12 +69,7 @@ class RNIapAmazonModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun buyItemByType(
-        type: String?,
         sku: String?,
-        purchaseToken: String?,
-        prorationMode: Int?,
-        obfuscatedAccountId: String?,
-        obfuscatedProfileId: String?,
         promise: Promise
     ) {
         DoobooUtils.instance.addPromiseForKey(PROMISE_BUY_ITEM, promise)