fix: align GA kits with directory major 23 (+ per-kit Kotlin 2.2.20)

.github/workflows/daily.yml

@@ -240,6 +240,10 @@ jobs:
         run: ./gradlew lint -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
       - name: "Run Isolated Kit Lint (urbanairship-kit)"
         run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 lint
+      - name: "Run Isolated Kit Lint (ga-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga/ga-23 lint
+      - name: "Run Isolated Kit Lint (ga4-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga4/ga4-23 lint
       - name: "Archive Test Results"
         uses: actions/upload-artifact@v7
         if: always()
@@ -279,6 +283,10 @@ jobs:
         run: ./gradlew ktlintCheck -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
       - name: "Run Isolated Kit Kotlin Lint (urbanairship-kit)"
         run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 ktlintCheck
+      - name: "Run Isolated Kit Kotlin Lint (ga-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga/ga-23 ktlintCheck
+      - name: "Run Isolated Kit Kotlin Lint (ga4-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga4/ga4-23 ktlintCheck
       - name: "Archive Test Results"
         uses: actions/upload-artifact@v7
         if: always()
@@ -321,6 +329,10 @@ jobs:
         run: ./gradlew clean testRelease -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
       - name: "Test Isolated Kits (urbanairship-kit)"
         run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 clean testRelease
+      - name: "Test Isolated Kits (ga-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga/ga-23 clean testRelease
+      - name: "Test Isolated Kits (ga4-kit)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga4/ga4-23 clean testRelease
 
   semantic-release-dryrun:
     name: "Test Semantic Release - Dry Run"

.github/workflows/pull-request.yml

@@ -178,6 +178,10 @@ jobs:
         run: ./gradlew -p kits testRelease -c ../settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
       - name: "Run Isolated Kit Compatibility Tests (urbanairship)"
         run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 -PisRelease=true testRelease
+      - name: "Run Isolated Kit Compatibility Tests (ga)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga/ga-23 -PisRelease=true testRelease
+      - name: "Run Isolated Kit Compatibility Tests (ga4)"
+        run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/ga4/ga4-23 -PisRelease=true testRelease
 
   automerge-dependabot:
     name: "Save PR Number for Dependabot Automerge"

ONBOARDING.md

@@ -142,6 +142,8 @@ Kotlin version.
 **Currently isolated:**
 
 - `kits/urbanairship/urbanairship-20` (Kotlin 2.2.x, `urbanairship-core:20.3.0`)
+- `kits/ga/ga-23` (Kotlin 2.2.x, `firebase-analytics:23.x`)
+- `kits/ga4/ga4-23` (Kotlin 2.2.x, `firebase-analytics:23.x`)
 
 To build an isolated kit after publishing core to mavenLocal:
 

kits/ga/ga-23/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '2.1.20'
+    ext.kotlin_version = '2.2.20'
     if (!project.hasProperty('version') || project.version.equals('unspecified')) {
         project.version = '+'
     }
@@ -60,6 +60,6 @@ android {
 dependencies {
     testImplementation files('libs/java-json.jar')
     testImplementation files('libs/test-utils.aar')
-    testImplementation 'com.google.android.gms:play-services-measurement-api:[22.1.0,23.0.0)'
-    compileOnly 'com.google.firebase:firebase-analytics:[22.1.0,23.0.0)'
+    testImplementation 'com.google.android.gms:play-services-measurement-api:[23.0.0,24.0.0)'
+    compileOnly 'com.google.firebase:firebase-analytics:[23.0.0,24.0.0)'
 }

kits/ga4/ga4-23/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '2.1.20'
+    ext.kotlin_version = '2.2.20'
     if (!project.hasProperty('version') || project.version.equals('unspecified')) {
         project.version = '+'
     }
@@ -60,7 +60,7 @@ android {
 dependencies {
     testImplementation files('libs/java-json.jar')
     testImplementation files('libs/test-utils.aar')
-    testImplementation 'com.google.android.gms:play-services-measurement-api:[22.1.0,23.0.0)'
+    testImplementation 'com.google.android.gms:play-services-measurement-api:[23.0.0,24.0.0)'
 
-    compileOnly 'com.google.firebase:firebase-analytics:[22.1.0,23.0.0)'
+    compileOnly 'com.google.firebase:firebase-analytics:[23.0.0,24.0.0)'
 }

kits/matrix.json

@@ -77,18 +77,6 @@
     "kit_project": ":kits:android-comscore:comscore-6",
     "example_kotlin_project": ":kits:android-comscore:comscore-6:example-kotlin"
   },
-  {
-    "name": "ga-23",
-    "local_path": "kits/ga/ga-23",
-    "kit_project": ":kits:android-ga:ga-23",
-    "example_kotlin_project": ":kits:android-ga:ga-23:example-kotlin"
-  },
-  {
-    "name": "ga4-23",
-    "local_path": "kits/ga4/ga4-23",
-    "kit_project": ":kits:android-ga4:ga4-23",
-    "example_kotlin_project": ":kits:android-ga4:ga4-23:example-kotlin"
-  },
   {
     "name": "iterable-3",
     "local_path": "kits/iterable/iterable-3",

settings-kit-examples.gradle

@@ -14,8 +14,6 @@ include ':kits:adjust:adjust-5:example-kotlin',
         ':kits:branch:branch-5:example-kotlin',
         ':kits:clevertap:clevertap-7:example-kotlin',
         ':kits:comscore:comscore-6:example-kotlin',
-        ':kits:ga:ga-23:example-kotlin',
-        ':kits:ga4:ga4-23:example-kotlin',
         ':kits:iterable:iterable-3:example-kotlin',
         ':kits:kochava:kochava-5:example-kotlin',
         ':kits:localytics:localytics-6:example-kotlin',
@@ -39,8 +37,6 @@ project(':kits:braze:braze-41:example-kotlin').projectDir = file('kits/braze/bra
 project(':kits:branch:branch-5:example-kotlin').projectDir = file('kits/branch/branch-5/example/example-kotlin')
 project(':kits:clevertap:clevertap-7:example-kotlin').projectDir = file('kits/clevertap/clevertap-7/example/example-kotlin')
 project(':kits:comscore:comscore-6:example-kotlin').projectDir = file('kits/comscore/comscore-6/example/example-kotlin')
-project(':kits:ga:ga-23:example-kotlin').projectDir = file('kits/ga/ga-23/example/example-kotlin')
-project(':kits:ga4:ga4-23:example-kotlin').projectDir = file('kits/ga4/ga4-23/example/example-kotlin')
 project(':kits:iterable:iterable-3:example-kotlin').projectDir = file('kits/iterable/iterable-3/example/example-kotlin')
 project(':kits:kochava:kochava-5:example-kotlin').projectDir = file('kits/kochava/kochava-5/example/example-kotlin')
 project(':kits:localytics:localytics-6:example-kotlin').projectDir = file('kits/localytics/localytics-6/example/example-kotlin')

settings-kits.gradle

@@ -15,8 +15,8 @@ include (
         ':kits:branch:branch-5',
         ':kits:clevertap:clevertap-7',
         ':kits:comscore:comscore-6',
-        ':kits:ga:ga-23',
-        ':kits:ga4:ga4-23',
+        //  ':kits:ga:ga-23',  // Kotlin 2.2.x -- built standalone (see ONBOARDING.md)
+        //  ':kits:ga4:ga4-23',  // Kotlin 2.2.x -- built standalone (see ONBOARDING.md)
         ':kits:iterable:iterable-3',
         ':kits:kochava:kochava-5',
         ':kits:localytics:localytics-6',