Analytics Major Version Updates (#840)

* More gradle updates * verion upgrades * Add kotlin compile version * Fix integration tests * Update plugins * Update AGP and Kotlin version * Demo app dependency cleanup * Remove unused proguard file * Fix deprecated gradle param * Update dokka * Update CHANGELOG * Add missing dependency * Fix dependencies * Downgrade dependency * Use Java 17 in CI * Update JVM args * Upgrade dependency * Try kotlin jvm toolchain * Upgrade room * Fix room publish * Remove AnalyticsBaseWorker * Remove open modifier
braintree · Dec 7, 2023 · 00ca9c2 · 00ca9c2
1 parent ad95e3d
commit 00ca9c2
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 29 deletions.
diff --git a/BraintreeCore/schemas/com.braintreepayments.api.AnalyticsDatabase/1.json b/BraintreeCore/schemas/com.braintreepayments.api.AnalyticsDatabase/1.json
@@ -0,0 +1,46 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "26584d407930d52f3d62ef77e729f1b4",
+    "entities": [
+      {
+        "tableName": "analytics_event",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `_id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "_id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '26584d407930d52f3d62ef77e729f1b4')"
+    ]
+  }
+}
diff --git a/BraintreeCore/src/main/java/com/braintreepayments/api/AnalyticsBaseWorker.kt b/BraintreeCore/src/main/java/com/braintreepayments/api/AnalyticsBaseWorker.kt
diff --git a/BraintreeCore/src/main/java/com/braintreepayments/api/AnalyticsUploadWorker.kt b/BraintreeCore/src/main/java/com/braintreepayments/api/AnalyticsUploadWorker.kt
@@ -1,6 +1,8 @@
 package com.braintreepayments.api
 
 import android.content.Context
+import androidx.annotation.RestrictTo
+import androidx.work.Worker
 import androidx.work.WorkerParameters
 
 /**
@@ -9,13 +11,14 @@ import androidx.work.WorkerParameters
  * It is not subject to semantic versioning and may change at any time.
  * @suppress
  */
-open class AnalyticsUploadWorker(
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+class AnalyticsUploadWorker(
     context: Context,
     params: WorkerParameters
-) : AnalyticsBaseWorker(context, params) {
+) : Worker(context, params) {
 
     override fun doWork(): Result {
-        val analyticsClient = createAnalyticsClientFromInputData()
+        val analyticsClient = AnalyticsClient(applicationContext)
         return analyticsClient.uploadAnalytics(applicationContext, inputData)
     }
 }
diff --git a/BraintreeCore/src/main/java/com/braintreepayments/api/AnalyticsWriteToDbWorker.kt b/BraintreeCore/src/main/java/com/braintreepayments/api/AnalyticsWriteToDbWorker.kt
@@ -1,6 +1,8 @@
 package com.braintreepayments.api
 
 import android.content.Context
+import androidx.annotation.RestrictTo
+import androidx.work.Worker
 import androidx.work.WorkerParameters
 
 /**
@@ -9,13 +11,14 @@ import androidx.work.WorkerParameters
  * It is not subject to semantic versioning and may change at any time.
  * @suppress
  */
-open class AnalyticsWriteToDbWorker(
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+class AnalyticsWriteToDbWorker(
     context: Context,
     params: WorkerParameters
-) : AnalyticsBaseWorker(context, params) {
+) : Worker(context, params) {
 
     override fun doWork(): Result {
-        val analyticsClient = createAnalyticsClientFromInputData()
+        val analyticsClient = AnalyticsClient(applicationContext)
         return analyticsClient.writeAnalytics(inputData)
     }
 }