Merge pull request #60 from growthbook/refactoring/follow-documentation

Refactoring: Adapting GBSDKBuilder class according to the documentation
growthbook · Jul 5, 2023 · 853cf38 · 853cf38
2 parents 30b22a1 + ca561d7
commit 853cf38
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/GrowthBook/build.gradle.kts b/GrowthBook/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "io.growthbook.sdk"
-version = "1.1.33"
+version = "1.1.34"
 
 kotlin {
 
@@ -95,14 +95,14 @@ android {
     }
     buildTypes {
         release {
-            isMinifyEnabled = true
+            isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
         }
         debug {
-            isMinifyEnabled = true
+            isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

diff --git a/GrowthBook/src/commonMain/kotlin/com/sdk/growthbook/GrowthBookSDK.kt b/GrowthBook/src/commonMain/kotlin/com/sdk/growthbook/GrowthBookSDK.kt
@@ -115,9 +115,12 @@ class GBSDKBuilderJAVA(
  * Tracking Callback - Track Events for Experiments
  * EncryptionKey - Encryption key if you intend to use data encryption.
  */
-class GBSDKBuilderApp(
-    apiKey: String, hostURL: String, attributes: Map<String, Any>,
-    trackingCallback: GBTrackingCallback, encryptionKey: String?
+class GBSDKBuilder(
+    apiKey: String,
+    hostURL: String,
+    attributes: Map<String, Any>,
+    trackingCallback: GBTrackingCallback,
+    encryptionKey: String? = null
 ) : SDKBuilder(
     apiKey, hostURL,
     attributes, trackingCallback, encryptionKey
@@ -130,7 +133,7 @@ class GBSDKBuilderApp(
     /**
      * Set Refresh Handler - Will be called when cache is refreshed
      */
-    fun setRefreshHandler(refreshHandler: GBCacheRefreshHandler): GBSDKBuilderApp {
+    fun setRefreshHandler(refreshHandler: GBCacheRefreshHandler): GBSDKBuilder {
         this.refreshHandler = refreshHandler
         return this
     }

diff --git a/...Book/src/commonTest/kotlin/com/sdk/growthbook/integration/VerifySDKReturnFeatureValues.kt b/...Book/src/commonTest/kotlin/com/sdk/growthbook/integration/VerifySDKReturnFeatureValues.kt
@@ -1,6 +1,6 @@
 package com.sdk.growthbook.integration
 
-import com.sdk.growthbook.GBSDKBuilderApp
+import com.sdk.growthbook.GBSDKBuilder
 import com.sdk.growthbook.GrowthBookSDK
 import com.sdk.growthbook.tests.MockNetworkClient
 import org.intellij.lang.annotations.Language
@@ -83,7 +83,7 @@ internal class VerifySDKReturnFeatureValues {
     }
 
     private fun buildSDK(json: String, attributes: Map<String, Any> = mapOf()): GrowthBookSDK {
-        return GBSDKBuilderApp(
+        return GBSDKBuilder(
             "some_key",
             "http://host.com",
             attributes = attributes,

diff --git a/GrowthBook/src/commonTest/kotlin/com/sdk/growthbook/tests/GBEncryptedFeatures.kt b/GrowthBook/src/commonTest/kotlin/com/sdk/growthbook/tests/GBEncryptedFeatures.kt
@@ -1,6 +1,6 @@
 package com.sdk.growthbook.tests
 
-import com.sdk.growthbook.GBSDKBuilderApp
+import com.sdk.growthbook.GBSDKBuilder
 import com.sdk.growthbook.Utils.DefaultCrypto
 import com.sdk.growthbook.Utils.encryptToFeaturesDataModel
 import com.sdk.growthbook.model.GBExperiment
@@ -52,7 +52,7 @@ class GBEncryptedFeatures {
     @Test
     fun testEncrypt() {
 
-        val sdkInstance = GBSDKBuilderApp(
+        val sdkInstance = GBSDKBuilder(
             testApiKey,
             testHostURL,
             attributes = testAttributes,

diff --git a/GrowthBook/src/commonTest/kotlin/com/sdk/growthbook/tests/GrowthBookSDKBuilderTests.kt b/GrowthBook/src/commonTest/kotlin/com/sdk/growthbook/tests/GrowthBookSDKBuilderTests.kt
@@ -1,6 +1,6 @@
 package com.sdk.growthbook.tests
 
-import com.sdk.growthbook.GBSDKBuilderApp
+import com.sdk.growthbook.GBSDKBuilder
 import com.sdk.growthbook.GBSDKBuilderJAVA
 import com.sdk.growthbook.GrowthBookSDK
 import com.sdk.growthbook.Utils.GBCacheRefreshHandler
@@ -29,7 +29,7 @@ class GrowthBookSDKBuilderTests {
     @Test
     fun testSDKInitilizationDefault() {
 
-        val sdkInstance = GBSDKBuilderApp(
+        val sdkInstance = GBSDKBuilder(
             testApiKey,
             testHostURL,
             attributes = testAttributes,
@@ -50,7 +50,7 @@ class GrowthBookSDKBuilderTests {
 
         val variations: HashMap<String, Int> = HashMap()
 
-        val sdkInstance = GBSDKBuilderApp(
+        val sdkInstance = GBSDKBuilder(
             testApiKey,
             testHostURL,
             attributes = testAttributes,
@@ -73,7 +73,7 @@ class GrowthBookSDKBuilderTests {
 
         val variations: HashMap<String, Int> = HashMap()
 
-        val sdkInstance = GBSDKBuilderApp(
+        val sdkInstance = GBSDKBuilder(
             testApiKey,
             testHostURL,
             attributes = testAttributes,
@@ -98,7 +98,7 @@ class GrowthBookSDKBuilderTests {
 
         var isRefreshed = false
 
-        val sdkInstance = GBSDKBuilderApp(
+        val sdkInstance = GBSDKBuilder(
             testApiKey,
             testHostURL,
             attributes = testAttributes,
@@ -125,7 +125,7 @@ class GrowthBookSDKBuilderTests {
         val gbError = GBError(error = null)
         val gbCacheRefreshHandler: GBCacheRefreshHandler = { isRefreshed, gbError -> }
 
-        val sdkInstance = GBSDKBuilderApp(
+        val sdkInstance = GBSDKBuilder(
             testApiKey,
             testHostURL,
             encryptionKey = null,
@@ -145,7 +145,7 @@ class GrowthBookSDKBuilderTests {
     @Test
     fun testSDKRunMethods() {
 
-        val sdkInstance = GBSDKBuilderApp(
+        val sdkInstance = GBSDKBuilder(
             testApiKey,
             testHostURL,
             attributes = testAttributes,
@@ -167,7 +167,7 @@ class GrowthBookSDKBuilderTests {
         attributes: Map<String, Any> = mapOf(),
         encryptionKey: String?
     ): GrowthBookSDK {
-        return GBSDKBuilderApp(
+        return GBSDKBuilder(
             "some_key",
             "http://host.com",
             attributes = attributes,