Release

.github/workflows/main-without-core.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Gradle clean
       run: ./gradlew clean --info
     - name: Build with Gradle
-      run: ./gradlew :DefaultNetworkDispatcher:build :GrowthBook:build --info
+      run: ./gradlew kotlinUpgradeYarnLock :DefaultNetworkDispatcher:build :GrowthBook:build --info
 #    - name: release
 #      uses: actions/create-release@v1
 #      id: create_release

.github/workflows/main.yml

@@ -32,7 +32,7 @@ jobs:
     - name: Gradle clean
       run: ./gradlew clean --info
     - name: Build with Gradle
-      run: ./gradlew -Pversion=$LIB_VERSION :GrowthBook:build --info
+      run: ./gradlew -Pversion=$LIB_VERSION kotlinUpgradeYarnLock :GrowthBook:build --info
     - name: release
       uses: actions/create-release@v1
       id: create_release

.github/workflows/publish-core-module.yml

@@ -25,4 +25,4 @@ jobs:
       run: ./gradlew -Pversion=$CORE_MODULE_VERSION :Core:build --info
     - name: Publish to maven central
       run: |
-        GPG_PRIVATE_KEY="${{secrets.GPG_PRIVATE_KEY}}" GPG_PRIVATE_PASSWORD="${{secrets.GPG_PRIVATE_PASSWORD}}" GB_SONATYPE_USERNAME='${{secrets.GB_SONATYPE_USERNAME}}' GB_SONATYPE_PASSWORD='${{secrets.GB_SONATYPE_PASSWORD}}' ./gradlew -Pversion=$CORE_MODULE_VERSION :Core:publish
+        GPG_PRIVATE_KEY="${{secrets.GPG_PRIVATE_KEY}}" GPG_PRIVATE_PASSWORD="${{secrets.GPG_PRIVATE_PASSWORD}}" GB_SONATYPE_USERNAME='${{secrets.GB_SONATYPE_USERNAME}}' GB_SONATYPE_PASSWORD='${{secrets.GB_SONATYPE_PASSWORD}}' ./gradlew -Pversion=$CORE_MODULE_VERSION kotlinUpgradeYarnLock :Core:publish

.github/workflows/publish-ktor-dispatcher-module.yml

@@ -25,4 +25,4 @@ jobs:
       run: ./gradlew -Pversion=$DISPATCHER_VERSION :NetworkDispatcherKtor:build --info
     - name: Publish to maven central
       run: |
-        GPG_PRIVATE_KEY="${{secrets.GPG_PRIVATE_KEY}}" GPG_PRIVATE_PASSWORD="${{secrets.GPG_PRIVATE_PASSWORD}}" GB_SONATYPE_USERNAME='${{secrets.GB_SONATYPE_USERNAME}}' GB_SONATYPE_PASSWORD='${{secrets.GB_SONATYPE_PASSWORD}}' ./gradlew -Pversion=$DISPATCHER_VERSION :NetworkDispatcherKtor:publish
+        GPG_PRIVATE_KEY="${{secrets.GPG_PRIVATE_KEY}}" GPG_PRIVATE_PASSWORD="${{secrets.GPG_PRIVATE_PASSWORD}}" GB_SONATYPE_USERNAME='${{secrets.GB_SONATYPE_USERNAME}}' GB_SONATYPE_PASSWORD='${{secrets.GB_SONATYPE_PASSWORD}}' ./gradlew -Pversion=$DISPATCHER_VERSION kotlinUpgradeYarnLock :NetworkDispatcherKtor:publish

.github/workflows/publish-okhttp-dispatcher.yml

@@ -25,4 +25,4 @@ jobs:
         run: ./gradlew -Pversion=$DISPATCHER_VERSION :NetworkDispatcherOkHttp:build --info
       - name: Publish to maven central
         run: |
-         GPG_PRIVATE_KEY="${{secrets.GPG_PRIVATE_KEY}}" GPG_PRIVATE_PASSWORD="${{secrets.GPG_PRIVATE_PASSWORD}}" GB_SONATYPE_USERNAME='${{secrets.GB_SONATYPE_USERNAME}}' GB_SONATYPE_PASSWORD='${{secrets.GB_SONATYPE_PASSWORD}}' ./gradlew -Pversion=$DISPATCHER_VERSION :NetworkDispatcherOkHttp:publish
+         GPG_PRIVATE_KEY="${{secrets.GPG_PRIVATE_KEY}}" GPG_PRIVATE_PASSWORD="${{secrets.GPG_PRIVATE_PASSWORD}}" GB_SONATYPE_USERNAME='${{secrets.GB_SONATYPE_USERNAME}}' GB_SONATYPE_PASSWORD='${{secrets.GB_SONATYPE_PASSWORD}}' ./gradlew -Pversion=$DISPATCHER_VERSION kotlinUpgradeYarnLock :NetworkDispatcherOkHttp:publish

.github/workflows/upload-binaries.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Gradle clean
       run: ./gradlew clean --info
     - name: Build with Gradle
-      run: ./gradlew -Pversion=${{ env.LIB_VERSION }} build --info
+      run: ./gradlew -Pversion=${{ env.LIB_VERSION }} kotlinUpgradeYarnLock build --info
     - name: release
       uses: actions/create-release@v1
       id: create_release

Core/build.gradle.kts

@@ -1,20 +1,34 @@
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput
+import org.jetbrains.kotlin.gradle.targets.js.yarn.yarn
+
 plugins {
     kotlin("multiplatform")
     id("com.android.library")
     kotlin("plugin.serialization")
-    id("maven-publish")
-    id("signing")
     id("org.jetbrains.dokka") version "1.8.10"
 }
 
 group = "io.growthbook.sdk"
-version = "1.0.2"
+version = "1.0.3"
 
 kotlin {
-    android {
+    androidTarget {
         publishLibraryVariants("release")
     }
 
+    js {
+        yarn.lockFileDirectory = file("kotlin-js-store")
+        browser {
+            commonWebpackConfig {
+                output = KotlinWebpackOutput(
+                    library = project.name,
+                    libraryTarget = KotlinWebpackOutput.Target.UMD,
+                    globalObject = KotlinWebpackOutput.Target.WINDOW
+                )
+            }
+        }
+    }
+
     jvm {
         compilations.all {
             kotlinOptions.jvmTarget = "1.8"
@@ -28,7 +42,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
             }
         }
     }
@@ -48,6 +62,10 @@ android {
             isMinifyEnabled = false
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 }
 
 val dokkaOutputDir = "$buildDir/dokka"
@@ -128,9 +146,5 @@ publishing {
  * Signing JAR using GPG Keys
  */
 signing {
-    useInMemoryPgpKeys(
-        System.getenv("GPG_PRIVATE_KEY"),
-        System.getenv("GPG_PRIVATE_PASSWORD")
-    )
     sign(publishing.publications)
-}
+}

Core/src/jsMain/kotlin/com/sdk/growthbook/Dispatcher.kt

@@ -0,0 +1,8 @@
+package com.sdk.growthbook
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+// 1
+actual val PlatformDependentIODispatcher: CoroutineDispatcher =
+    Dispatchers.Unconfined

GrowthBook/build.gradle.kts

@@ -1,25 +1,39 @@
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput
+import org.jetbrains.kotlin.gradle.targets.js.yarn.yarn
+
 plugins {
     kotlin("multiplatform")
     id("com.android.library")
     kotlin("plugin.serialization")
-    id("maven-publish")
-    id("signing")
-    id("org.jetbrains.dokka") version "1.8.10"
+    id("org.jetbrains.dokka") version "1.9.10"
 }
 
 group = "io.growthbook.sdk"
-version = "1.1.62"
+version = "1.1.63"
 
 kotlin {
 
     val ktorVersion = "2.1.2"
     val serializationVersion = "1.3.3"
     val kryptoVersion = "2.7.0"
 
-    android {
+    androidTarget {
         publishLibraryVariants("release")
     }
 
+    js {
+        yarn.lockFileDirectory = file("kotlin-js-store")
+        browser {
+            commonWebpackConfig {
+                output = KotlinWebpackOutput(
+                    library = project.name,
+                    libraryTarget = KotlinWebpackOutput.Target.UMD,
+                    globalObject = KotlinWebpackOutput.Target.WINDOW
+                )
+            }
+        }
+    }
+
     jvm {
         compilations.all {
             kotlinOptions.jvmTarget = "1.8"
@@ -38,7 +52,7 @@ kotlin {
                 implementation("com.ionspin.kotlin:bignum:0.3.3")
                 implementation("com.soywiz.korlibs.krypto:krypto:$kryptoVersion")
 
-                api("io.growthbook.sdk:Core:1.0.2")
+                api(project(":Core"))
                 api(
                     "org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion"
                 )
@@ -60,7 +74,7 @@ kotlin {
                 implementation("com.soywiz.korlibs.krypto:krypto-android:$kryptoVersion")
             }
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("junit:junit:4.13.2")
@@ -111,6 +125,10 @@ android {
             )
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 }
 
 val dokkaOutputDir = "$buildDir/dokka"
@@ -191,9 +209,5 @@ publishing {
  * Signing JAR using GPG Keys
  */
 signing {
-    useInMemoryPgpKeys(
-        System.getenv("GPG_PRIVATE_KEY"),
-        System.getenv("GPG_PRIVATE_PASSWORD")
-    )
     sign(publishing.publications)
 }

GrowthBook/src/commonMain/kotlin/com/sdk/growthbook/GBSDKBuilder.kt

@@ -16,6 +16,7 @@ import com.sdk.growthbook.utils.GBCacheRefreshHandler
  * EncryptionKey - Encryption key if you intend to use data encryption
  * Network Dispatcher - Network Dispatcher
  * Remote eval - Whether to use Remote Evaluation
+ * enableLogging - Prints logging statements to stdout
  */
 abstract class SDKBuilder(
     val apiKey: String,
@@ -25,6 +26,7 @@ abstract class SDKBuilder(
     val encryptionKey: String?,
     val networkDispatcher: NetworkDispatcher,
     val remoteEval: Boolean,
+    val enableLogging: Boolean,
 ) {
     internal var qaMode: Boolean = false
     internal var forcedVariations: Map<String, Int> = HashMap()
@@ -69,6 +71,7 @@ abstract class SDKBuilder(
  * EncryptionKey - Encryption key if you intend to use data encryption
  * Network Dispatcher - Network Dispatcher
  * Remote eval - Whether to use Remote Evaluation
+ * enableLogging - Prints logging statements to stdout
  */
 class GBSDKBuilder(
     apiKey: String,
@@ -78,9 +81,10 @@ class GBSDKBuilder(
     encryptionKey: String? = null,
     trackingCallback: GBTrackingCallback,
     remoteEval: Boolean = false,
+    enableLogging: Boolean = false,
 ) : SDKBuilder(
     apiKey, hostURL,
-    attributes, trackingCallback, encryptionKey, networkDispatcher, remoteEval
+    attributes, trackingCallback, encryptionKey, networkDispatcher, remoteEval, enableLogging
 ) {
 
     private var refreshHandler: GBCacheRefreshHandler? = null
@@ -145,13 +149,14 @@ class GBSDKBuilder(
             onFeatureUsage = featureUsageCallback,
             encryptionKey = encryptionKey,
             remoteEval = remoteEval,
+            enableLogging = enableLogging,
             stickyBucketService = stickyBucketService,
         )
 
         return GrowthBookSDK(
             gbContext,
             refreshHandler,
-            networkDispatcher
+            networkDispatcher,
         )
     }
 }

GrowthBook/src/commonMain/kotlin/com/sdk/growthbook/GrowthBookSDK.kt

@@ -22,9 +22,9 @@ import com.sdk.growthbook.model.GBFeatureResult
 import com.sdk.growthbook.utils.toHashMap
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonElement
 
-typealias GBTrackingCallback = (GBExperiment, GBExperimentResult) -> Unit
-typealias GBExperimentRunCallback = (GBExperiment, GBExperimentResult) -> Unit
+typealias GBTrackingCallback = (GBExperiment, GBExperimentResult?) -> Unit
 typealias GBFeatureUsageCallback = (featureKey: String, gbFeatureResult: GBFeatureResult) -> Unit
 
 /**
@@ -35,11 +35,10 @@ typealias GBFeatureUsageCallback = (featureKey: String, gbFeatureResult: GBFeatu
 class GrowthBookSDK() : FeaturesFlowDelegate {
 
     private var refreshHandler: GBCacheRefreshHandler? = null
-    private var subscriptions: MutableList<GBExperimentRunCallback> = mutableListOf()
     private lateinit var networkDispatcher: NetworkDispatcher
     private lateinit var featuresViewModel: FeaturesViewModel
     private var attributeOverrides: Map<String, Any> = emptyMap()
-    private var forcedFeatures: Map<String, Any> = emptyMap()
+    private var forcedFeatures: Map<String, JsonElement> = emptyMap()
     private var savedGroups: Map<String, Any>? = emptyMap()
 
     //@ThreadLocal
@@ -65,7 +64,10 @@ class GrowthBookSDK() : FeaturesFlowDelegate {
         this.featuresViewModel =
             FeaturesViewModel(
                 delegate = this,
-                dataSource = FeaturesDataSource(dispatcher = networkDispatcher),
+                dataSource = FeaturesDataSource(
+                    dispatcher = networkDispatcher,
+                    enableLogging = context.enableLogging,
+                ),
                 encryptionKey = gbContext.encryptionKey,
             )
         if (features != null) {
@@ -78,14 +80,6 @@ class GrowthBookSDK() : FeaturesFlowDelegate {
         refreshStickyBucketService()
     }
 
-    fun subscribe(callback: GBExperimentRunCallback) {
-        this.subscriptions.add(callback)
-    }
-
-    fun clearSubscriptions() {
-        this.subscriptions.clear()
-    }
-
     fun setSavedGroups(savedGroups: Map<String, Any>) {
         gbContext.savedGroups = savedGroups
     }
@@ -182,7 +176,8 @@ class GrowthBookSDK() : FeaturesFlowDelegate {
         return GBFeatureEvaluator().evaluateFeature(
             context = gbContext,
             featureKey = id,
-            attributeOverrides = attributeOverrides
+            attributeOverrides = attributeOverrides,
+            forcedFeature = this.forcedFeatures
         )
     }
 
@@ -198,23 +193,17 @@ class GrowthBookSDK() : FeaturesFlowDelegate {
      * The run method takes an Experiment object and returns an ExperimentResult
      */
     fun run(experiment: GBExperiment): GBExperimentResult {
-        val result = GBExperimentEvaluator().evaluateExperiment(
+        return GBExperimentEvaluator().evaluateExperiment(
             context = gbContext,
             experiment = experiment,
             attributeOverrides = attributeOverrides
         )
-
-        this.subscriptions.forEach { subscription ->
-            subscription(experiment, result)
-        }
-
-        return result
     }
 
     /**
      * The setForcedFeatures method setup the Map of user's (forced) features
      */
-    fun setForcedFeatures(forcedFeatures: Map<String, Any>) {
+    fun setForcedFeatures(forcedFeatures: Map<String, JsonElement>) {
         this.forcedFeatures = forcedFeatures
     }