Merge pull request #6 from glassfy/DEV-117-paywall

Dev 117 paywall

GlassfyGlue.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'GlassfyGlue'
-  s.version          = '1.3.6'
+  s.version          = '1.4.0'
   s.summary          = 'Glassfy Glue'
 
   s.homepage         = 'https://github.com/glassfy/glassfy-glue.git'
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
 
   s.source_files = 'ios/Source/Public/*.h', 'ios/Source/*.{h,m}'
   s.public_header_files = 'ios/Source/Public/*.h'
-  s.dependency 'Glassfy', '1.3.8'
+  s.dependency 'Glassfy', '1.4.0'
 
   s.test_spec 'GlassfyGlueTests' do |test_spec|
       test_spec.source_files = 'ios/Tests/*.{h,m,swift}'

README.md

@@ -16,7 +16,7 @@ GlassfyGlue is available through [CocoaPods](https://cocoapods.org) and [Maven C
 Add the following line to your Podfile:
 
 ```ruby
-pod 'GlassfyGlue', '~> 1.3.6'
+pod 'GlassfyGlue', '~> 1.4.0'
 ```
 
 ### Install on android
@@ -26,7 +26,7 @@ Add the dependency to your module-level `build.gradle`:
 ```gradle
 dependencies {
     [...]
-    implementation 'io.glassfy:androidglue:1.3.11'
+    implementation 'io.glassfy:androidglue:1.4.0'
 }
 ```
 

android/build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id 'com.android.library' version '7.1.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
-    id 'org.jetbrains.dokka' version '1.6.10' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
+    id 'org.jetbrains.dokka' version '1.8.10' apply false
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' apply true
 }
 

android/buildSrc/src/main/kotlin/io/glassfy/glue/Configuration.kt

@@ -5,8 +5,8 @@ object Configuration {
     const val targetSdk = 28
     const val minSdk = 21
     private const val majorVersion = 1
-    private const val minorVersion = 3
-    private const val patchVersion = 11
+    private const val minorVersion = 4
+    private const val patchVersion = 0
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
     const val snapshotVersionName = "$versionName-SNAPSHOT"
     const val artifactGroup = "io.glassfy"

android/glue/build.gradle.kts

@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-    implementation("io.glassfy:androidsdk:1.3.11")
+    implementation("io.glassfy:androidsdk:1.4.0")
 }
 
 // Sources

android/glue/src/main/kotlin/io/glassfy/glue/GlassfyEncoding.kt

@@ -3,18 +3,16 @@ package io.glassfy.glue
 import io.glassfy.androidsdk.model.*
 import org.json.JSONArray
 import org.json.JSONObject
-import java.text.DateFormat
-import java.text.SimpleDateFormat
 
-fun encodeArray(array:List<JSONObject>):JSONArray {
+fun encodeArray(array:List<JSONObject>): JSONArray {
     val all = JSONArray()
     array.forEach {
         all.put(it)
     }
     return all
 }
 
-fun encodeStringArray(array:List<String>):JSONArray {
+fun encodeStringArray(array:List<String>): JSONArray {
     val all = JSONArray()
     array.forEach {
         all.put(it)
@@ -146,13 +144,6 @@ fun Transaction.encodedJson(): JSONObject {
     return jo
 }
 
-fun skuFromJsonObject(jo: JSONObject):Sku {
-    val skuId = jo.optString("skuId")
-    val productId = jo.optString("productId")
-
-    return Sku(skuId,productId, emptyMap<String, String>(), null)
-}
-
 fun attributionItemFromJsonObject(jo: JSONObject): AttributionItem? {
     val joType = jo.optInt("type",-1)
 
@@ -162,17 +153,6 @@ fun attributionItemFromJsonObject(jo: JSONObject): AttributionItem? {
     return if (type != null) AttributionItem(type, value) else null
 }
 
-fun attributionItemsFromJsonArray(ja: JSONArray): List<AttributionItem> {
-    val items = mutableListOf<AttributionItem>()
-    for (i in 0 until ja.length()) {
-        val jo = ja.getJSONObject(i)
-        attributionItemFromJsonObject(jo)?.let { item ->
-            items.add(item)
-        }
-    }
-    return items
-}
-
 fun attributionItemTypeFromValue(value: Int): AttributionItem.Type? =
     when (value) {
         1 -> AttributionItem.Type.AdjustID
@@ -184,7 +164,7 @@ fun attributionItemTypeFromValue(value: Int): AttributionItem.Type? =
         else -> null
     }
 
-fun SkuDetails.encodedJson():JSONObject{
+fun SkuDetails.encodedJson(): JSONObject{
     val jo = JSONObject()
 
     jo.put("identifier", this.sku)
@@ -218,7 +198,7 @@ fun SkuDetails.encodedJson():JSONObject{
     return jo;
 }
 
-fun UserProperties.encodedJson():JSONObject {
+fun UserProperties.encodedJson(): JSONObject {
     val jo = JSONObject()
     jo.put("email", this.email)
     jo.put("token", this.token)