Merge pull request #12 from glassfy/androidsdk160

Support androidSDK 1.6.0
glassfy · Nov 16, 2023 · 5dd95b5 · 5dd95b5
2 parents 9b8cd3d + a169d5a
commit 5dd95b5
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/core/README.md b/core/README.md
@@ -4,7 +4,7 @@
 [![License](https://img.shields.io/cocoapods/l/Glassfy.svg?style=flat)](https://glassfy.io)
 [![Npm](https://img.shields.io/npm/v/react-native-glassfy-module)](https://www.npmjs.com/package/react-native-glassfy-module)
 
-Is the client for Glassfy: a subscription revenue optimisation infrastructure for mobile applications.
+Is the client for Glassfy: a subscription revenue optimization infrastructure for mobile applications.
 
 ### Installation
 

diff --git a/core/android/build.gradle b/core/android/build.gradle
@@ -129,6 +129,6 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-android:0.71.4'
-  implementation("io.glassfy:androidglue:1.5.2")
+  implementation("io.glassfy:androidglue:1.6.3")
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/core/package.json b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-glassfy-module",
-  "version": "1.5.3",
+  "version": "1.6.0",
   "description": "glassfy module",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/core/src/glassfy.ts b/core/src/glassfy.ts
@@ -15,7 +15,6 @@ import type {
   GlassfyVersion,
 } from './models';
 
-
 const LINKING_ERROR =
   `The package 'react-native-glassfy-module' doesn't seem to be linked. Make sure: \n\n` +
   Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
@@ -42,7 +41,7 @@ export class Glassfy {
     apiKey: string,
     watcherMode: boolean
   ): Promise<void> {
-    const version = '1.5.3';
+    const version = '1.6.0';
     return GlassfyModule.initialize(apiKey, watcherMode, version);
   }
 
@@ -136,6 +135,4 @@ export class Glassfy {
   ): Promise<void> {
     return GlassfyModule.setAttributions(items);
   }
-
-
 }
diff --git a/core/src/models.tsx b/core/src/models.tsx
@@ -94,6 +94,7 @@ export interface GlassfyProduct {
   readonly introductoryPrice: GlassfyProductDiscount;
   readonly discounts: GlassfyProductDiscount[];
   readonly period: String;
+  readonly basePlanId: String;
 }
 
 export interface GlassfySkuBase {
@@ -106,6 +107,9 @@ export interface GlassfySku extends GlassfySkuBase {
   readonly promotionalEligibility: GLASSFY_ELEGGIBILITY;
   readonly extravars: { [key: string]: string };
   readonly product: GlassfyProduct;
+  readonly basePlanId: string;
+  readonly offerId: string;
+  readonly discount: GlassfyProductDiscount;
 }
 
 export interface GlassfySkuPaddle extends GlassfySkuBase {
@@ -120,6 +124,8 @@ export interface GlassfySkuPaddle extends GlassfySkuBase {
 export interface GlassfyAccountableSku extends GlassfySkuBase {
   readonly isInIntroOfferPeriod: boolean;
   readonly isInTrialPeriod: boolean;
+  readonly basePlanId: string;
+  readonly offerId: string;
 }
 
 export interface GlassfyOffering {

diff --git a/ui/android/build.gradle b/ui/android/build.gradle
@@ -129,7 +129,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-android:0.71.4'
-  implementation("io.glassfy:androidglue:1.5.2")
-  implementation("io.glassfy:paywall:1.5.2")
+  implementation("io.glassfy:androidglue:1.6.3")
+  implementation("io.glassfy:paywall:1.6.0")
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/ui/package.json b/ui/package.json
@@ -63,12 +63,12 @@
     "pod-install": "^0.1.0",
     "prettier": "^2.0.5",
     "react-native-builder-bob": "^0.18.0",
-    "react-native-glassfy-module": "1.5.3",
+    "react-native-glassfy-module": "1.6.0",
     "release-it": "^14.2.2",
     "typescript": "^4.8.4"
   },
   "peerDependencies": {
-    "react-native-glassfy-module": "1.5.3",
+    "react-native-glassfy-module": "1.6.0",
     "react": "*",
     "react-native": "*"
   },