From 45d91976dfd8c7d2eaa003f3b3d2579a32aa47a1 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Mon, 22 Jun 2026 16:22:36 -0400 Subject: [PATCH 1/5] feat(kits): add adjust sample apps and CI example builds Introduce Kotlin/Java sample apps for adjust-5 and wire a CI-only settings file so example modules stay isolated from kit settings and settings-kits.gradle. --- .github/workflows/build-kits.yml | 69 +++++++++++++++++++ .github/workflows/pull-request.yml | 4 ++ .../example/example-java/build.gradle | 33 +++++++++ .../example-java/src/main/AndroidManifest.xml | 22 ++++++ .../example/java/ExampleApplication.java | 24 +++++++ .../adjust/example/java/MainActivity.java | 13 ++++ .../res/drawable/ic_launcher_foreground.xml | 14 ++++ .../src/main/res/layout/activity_main.xml | 14 ++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 ++ .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 ++ .../src/main/res/values/colors.xml | 4 ++ .../src/main/res/values/strings.xml | 4 ++ .../example/example-kotlin/build.gradle | 38 ++++++++++ .../src/main/AndroidManifest.xml | 22 ++++++ .../example/kotlin/ExampleApplication.kt | 24 +++++++ .../adjust/example/kotlin/MainActivity.kt | 11 +++ .../res/drawable/ic_launcher_foreground.xml | 14 ++++ .../src/main/res/layout/activity_main.xml | 14 ++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 ++ .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 ++ .../src/main/res/values/colors.xml | 4 ++ .../src/main/res/values/strings.xml | 4 ++ kits/matrix.json | 9 +++ settings-kit-examples.gradle | 8 +++ 24 files changed, 369 insertions(+) create mode 100644 .github/workflows/build-kits.yml create mode 100644 kits/adjust/adjust-5/example/example-java/build.gradle create mode 100644 kits/adjust/adjust-5/example/example-java/src/main/AndroidManifest.xml create mode 100644 kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/ExampleApplication.java create mode 100644 kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/MainActivity.java create mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/layout/activity_main.xml create mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/values/colors.xml create mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/values/strings.xml create mode 100644 kits/adjust/adjust-5/example/example-kotlin/build.gradle create mode 100644 kits/adjust/adjust-5/example/example-kotlin/src/main/AndroidManifest.xml create mode 100644 kits/adjust/adjust-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adjust/example/kotlin/ExampleApplication.kt create mode 100644 kits/adjust/adjust-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adjust/example/kotlin/MainActivity.kt create mode 100644 kits/adjust/adjust-5/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 kits/adjust/adjust-5/example/example-kotlin/src/main/res/layout/activity_main.xml create mode 100644 kits/adjust/adjust-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 kits/adjust/adjust-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 kits/adjust/adjust-5/example/example-kotlin/src/main/res/values/colors.xml create mode 100644 kits/adjust/adjust-5/example/example-kotlin/src/main/res/values/strings.xml create mode 100644 kits/matrix.json create mode 100644 settings-kit-examples.gradle diff --git a/.github/workflows/build-kits.yml b/.github/workflows/build-kits.yml new file mode 100644 index 000000000..b131ee1c1 --- /dev/null +++ b/.github/workflows/build-kits.yml @@ -0,0 +1,69 @@ +name: Build Kits + +on: + workflow_call: + workflow_dispatch: + +permissions: + contents: read + +jobs: + load-matrix: + name: Load kit matrix + runs-on: ubuntu-latest + outputs: + matrix: ${{ steps.set.outputs.matrix }} + steps: + - uses: actions/checkout@v6 + with: + sparse-checkout: kits/matrix.json + sparse-checkout-cone-mode: false + - id: set + run: echo "matrix=$(jq -c . kits/matrix.json)" >> "$GITHUB_OUTPUT" + + build-kits: + name: Build ${{ matrix.kit.name }} + needs: load-matrix + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + kit: ${{ fromJson(needs.load-matrix.outputs.matrix) }} + steps: + - name: Checkout + uses: actions/checkout@v6 + + - name: Set SDK version + run: | + echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV + echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV + + - name: Install JDK 17 + uses: actions/setup-java@v5 + with: + distribution: zulu + java-version: "17" + + - name: Publish core SDK to Maven Local + run: ./gradlew publishMavenPublicationToMavenLocal + + - name: Run kit unit tests + if: ${{ matrix.kit.skip_unit_tests != true }} + run: | + ./gradlew "${{ matrix.kit.kit_project }}:testRelease" \ + -c settings-kits.gradle \ + -Pmparticle.kit.mparticleFromMavenLocalOnly=true + + - name: Build Kotlin example + if: ${{ matrix.kit.skip_example_builds != true && matrix.kit.example_kotlin_project != '' }} + run: | + ./gradlew "${{ matrix.kit.example_kotlin_project }}:assembleDebug" \ + -c settings-kit-examples.gradle \ + -Pmparticle.kit.mparticleFromMavenLocalOnly=true + + - name: Build Java example + if: ${{ matrix.kit.skip_example_builds != true && matrix.kit.example_java_project != '' }} + run: | + ./gradlew "${{ matrix.kit.example_java_project }}:assembleDebug" \ + -c settings-kit-examples.gradle \ + -Pmparticle.kit.mparticleFromMavenLocalOnly=true diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 33308c7cf..0f86db33e 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -153,6 +153,9 @@ jobs: with: base_branch: main + build-kits: + uses: ./.github/workflows/build-kits.yml + kit-compatibility-test: name: "Kit Compatibility Test" runs-on: ubuntu-latest @@ -188,6 +191,7 @@ jobs: lint-checks, kotlin-lint-checks, kit-compatibility-test, + build-kits, ] uses: mParticle/mparticle-workflows/.github/workflows/dependabot-save-pr-number.yml@main diff --git a/kits/adjust/adjust-5/example/example-java/build.gradle b/kits/adjust/adjust-5/example/example-java/build.gradle new file mode 100644 index 000000000..c18fdcc6a --- /dev/null +++ b/kits/adjust/adjust-5/example/example-java/build.gradle @@ -0,0 +1,33 @@ +plugins { + id 'com.android.application' +} + +android { + namespace 'com.mparticle.kits.adjust.example.java' + compileSdk 34 + + defaultConfig { + applicationId 'com.mparticle.kits.adjust.example.java' + minSdk 21 + targetSdk 34 + versionCode 1 + versionName '1.0' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + buildTypes { + release { + minifyEnabled false + } + } +} + +dependencies { + implementation project(':kits:adjust:adjust-5') + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.11.0' +} diff --git a/kits/adjust/adjust-5/example/example-java/src/main/AndroidManifest.xml b/kits/adjust/adjust-5/example/example-java/src/main/AndroidManifest.xml new file mode 100644 index 000000000..84b1637c1 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-java/src/main/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + diff --git a/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/ExampleApplication.java b/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/ExampleApplication.java new file mode 100644 index 000000000..90e87a6f9 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/ExampleApplication.java @@ -0,0 +1,24 @@ +package com.mparticle.kits.adjust.example.java; + +import android.app.Application; + +import com.mparticle.MPEvent; +import com.mparticle.MParticle; +import com.mparticle.MParticleOptions; + +public class ExampleApplication extends Application { + @Override + public void onCreate() { + super.onCreate(); + MParticleOptions options = + MParticleOptions.builder(this) + .credentials( + "REPLACE WITH YOUR MPARTICLE API KEY", + "REPLACE WITH YOUR MPARTICLE API SECRET") + .logLevel(MParticle.LogLevel.VERBOSE) + .build(); + MParticle.start(options); + MParticle.getInstance() + .logEvent(new MPEvent.Builder("foo", MParticle.EventType.Other).build()); + } +} diff --git a/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/MainActivity.java b/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/MainActivity.java new file mode 100644 index 000000000..c22d1ac0d --- /dev/null +++ b/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/MainActivity.java @@ -0,0 +1,13 @@ +package com.mparticle.kits.adjust.example.java; + +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; + +public class MainActivity extends AppCompatActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + } +} diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/drawable/ic_launcher_foreground.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 000000000..046177833 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-java/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,14 @@ + + + + diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/layout/activity_main.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/layout/activity_main.xml new file mode 100644 index 000000000..e2897e3ff --- /dev/null +++ b/kits/adjust/adjust-5/example/example-java/src/main/res/layout/activity_main.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..a8a8fa551 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..a8a8fa551 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/values/colors.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/values/colors.xml new file mode 100644 index 000000000..f42ada656 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-java/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/values/strings.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/values/strings.xml new file mode 100644 index 000000000..c0e4daa69 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-java/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Adjust Kit Java Example + diff --git a/kits/adjust/adjust-5/example/example-kotlin/build.gradle b/kits/adjust/adjust-5/example/example-kotlin/build.gradle new file mode 100644 index 000000000..1935716d1 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-kotlin/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'com.mparticle.kits.adjust.example.kotlin' + compileSdk 34 + + defaultConfig { + applicationId 'com.mparticle.kits.adjust.example.kotlin' + minSdk 21 + targetSdk 34 + versionCode 1 + versionName '1.0' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = '17' + } + + buildTypes { + release { + minifyEnabled false + } + } +} + +dependencies { + implementation project(':kits:adjust:adjust-5') + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.11.0' +} diff --git a/kits/adjust/adjust-5/example/example-kotlin/src/main/AndroidManifest.xml b/kits/adjust/adjust-5/example/example-kotlin/src/main/AndroidManifest.xml new file mode 100644 index 000000000..84b1637c1 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-kotlin/src/main/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + diff --git a/kits/adjust/adjust-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adjust/example/kotlin/ExampleApplication.kt b/kits/adjust/adjust-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adjust/example/kotlin/ExampleApplication.kt new file mode 100644 index 000000000..d84519703 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adjust/example/kotlin/ExampleApplication.kt @@ -0,0 +1,24 @@ +package com.mparticle.kits.adjust.example.kotlin + +import android.app.Application +import com.mparticle.MPEvent +import com.mparticle.MParticle +import com.mparticle.MParticleOptions + +class ExampleApplication : Application() { + override fun onCreate() { + super.onCreate() + val options = + MParticleOptions + .builder(this) + .credentials( + "REPLACE WITH YOUR MPARTICLE API KEY", + "REPLACE WITH YOUR MPARTICLE API SECRET", + ).logLevel(MParticle.LogLevel.VERBOSE) + .build() + MParticle.start(options) + MParticle.getInstance()?.logEvent( + MPEvent.Builder("foo", MParticle.EventType.Other).build(), + ) + } +} diff --git a/kits/adjust/adjust-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adjust/example/kotlin/MainActivity.kt b/kits/adjust/adjust-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adjust/example/kotlin/MainActivity.kt new file mode 100644 index 000000000..8bb6d6233 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-kotlin/src/main/kotlin/com/mparticle/kits/adjust/example/kotlin/MainActivity.kt @@ -0,0 +1,11 @@ +package com.mparticle.kits.adjust.example.kotlin + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class MainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + } +} diff --git a/kits/adjust/adjust-5/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 000000000..046177833 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,14 @@ + + + + diff --git a/kits/adjust/adjust-5/example/example-kotlin/src/main/res/layout/activity_main.xml b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/layout/activity_main.xml new file mode 100644 index 000000000..e2897e3ff --- /dev/null +++ b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/layout/activity_main.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/kits/adjust/adjust-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..a8a8fa551 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/kits/adjust/adjust-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..a8a8fa551 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/kits/adjust/adjust-5/example/example-kotlin/src/main/res/values/colors.xml b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/values/colors.xml new file mode 100644 index 000000000..f42ada656 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + diff --git a/kits/adjust/adjust-5/example/example-kotlin/src/main/res/values/strings.xml b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/values/strings.xml new file mode 100644 index 000000000..69175f3b1 --- /dev/null +++ b/kits/adjust/adjust-5/example/example-kotlin/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Adjust Kit Kotlin Example + diff --git a/kits/matrix.json b/kits/matrix.json new file mode 100644 index 000000000..c00911078 --- /dev/null +++ b/kits/matrix.json @@ -0,0 +1,9 @@ +[ + { + "name": "adjust-5", + "local_path": "kits/adjust/adjust-5", + "kit_project": ":kits:android-adjust:adjust-5", + "example_kotlin_project": ":kits:android-adjust:adjust-5:example-kotlin", + "example_java_project": ":kits:android-adjust:adjust-5:example-java" + } +] diff --git a/settings-kit-examples.gradle b/settings-kit-examples.gradle new file mode 100644 index 000000000..5e7c97892 --- /dev/null +++ b/settings-kit-examples.gradle @@ -0,0 +1,8 @@ +// CI-only settings for kit sample apps. Keeps example modules out of settings-kits.gradle. +apply from: 'settings-kits.gradle' + +include ':kits:adjust:adjust-5:example-kotlin', + ':kits:adjust:adjust-5:example-java' + +project(':kits:adjust:adjust-5:example-kotlin').projectDir = file('kits/adjust/adjust-5/example/example-kotlin') +project(':kits:adjust:adjust-5:example-java').projectDir = file('kits/adjust/adjust-5/example/example-java') From 32a8744334983a11f93a9f20483dda844ed5a75a Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Mon, 22 Jun 2026 17:06:29 -0400 Subject: [PATCH 2/5] ci: pin build-kits workflow actions to commit SHAs Fix semgrep blocking findings for mutable GitHub Actions tag references. --- .github/workflows/build-kits.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-kits.yml b/.github/workflows/build-kits.yml index b131ee1c1..7bcd88c5f 100644 --- a/.github/workflows/build-kits.yml +++ b/.github/workflows/build-kits.yml @@ -14,7 +14,7 @@ jobs: outputs: matrix: ${{ steps.set.outputs.matrix }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: sparse-checkout: kits/matrix.json sparse-checkout-cone-mode: false @@ -31,7 +31,7 @@ jobs: kit: ${{ fromJson(needs.load-matrix.outputs.matrix) }} steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 - name: Set SDK version run: | @@ -39,7 +39,7 @@ jobs: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV - name: Install JDK 17 - uses: actions/setup-java@v5 + uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 with: distribution: zulu java-version: "17" From 45d99085efce015d252e230b6dd07cf7202e0972 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Tue, 23 Jun 2026 10:35:22 -0400 Subject: [PATCH 3/5] fix(kits): align Gradle project paths with android- kit names Use explicit android- prefixed includes and projectDir mappings so kit examples, dependencies, and CI matrix tasks resolve the same modules. --- .../example/example-java/build.gradle | 2 +- .../example/example-kotlin/build.gradle | 2 +- settings-kit-examples.gradle | 8 +-- settings-kits.gradle | 58 ++++++++++--------- 4 files changed, 37 insertions(+), 33 deletions(-) diff --git a/kits/adjust/adjust-5/example/example-java/build.gradle b/kits/adjust/adjust-5/example/example-java/build.gradle index c18fdcc6a..7e2d02f5a 100644 --- a/kits/adjust/adjust-5/example/example-java/build.gradle +++ b/kits/adjust/adjust-5/example/example-java/build.gradle @@ -27,7 +27,7 @@ android { } dependencies { - implementation project(':kits:adjust:adjust-5') + implementation project(':kits:android-adjust:adjust-5') implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.11.0' } diff --git a/kits/adjust/adjust-5/example/example-kotlin/build.gradle b/kits/adjust/adjust-5/example/example-kotlin/build.gradle index 1935716d1..1984b476a 100644 --- a/kits/adjust/adjust-5/example/example-kotlin/build.gradle +++ b/kits/adjust/adjust-5/example/example-kotlin/build.gradle @@ -32,7 +32,7 @@ android { } dependencies { - implementation project(':kits:adjust:adjust-5') + implementation project(':kits:android-adjust:adjust-5') implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.11.0' } diff --git a/settings-kit-examples.gradle b/settings-kit-examples.gradle index 5e7c97892..6239eacda 100644 --- a/settings-kit-examples.gradle +++ b/settings-kit-examples.gradle @@ -1,8 +1,8 @@ // CI-only settings for kit sample apps. Keeps example modules out of settings-kits.gradle. apply from: 'settings-kits.gradle' -include ':kits:adjust:adjust-5:example-kotlin', - ':kits:adjust:adjust-5:example-java' +include ':kits:android-adjust:adjust-5:example-kotlin', + ':kits:android-adjust:adjust-5:example-java' -project(':kits:adjust:adjust-5:example-kotlin').projectDir = file('kits/adjust/adjust-5/example/example-kotlin') -project(':kits:adjust:adjust-5:example-java').projectDir = file('kits/adjust/adjust-5/example/example-java') +project(':kits:android-adjust:adjust-5:example-kotlin').projectDir = file('kits/adjust/adjust-5/example/example-kotlin') +project(':kits:android-adjust:adjust-5:example-java').projectDir = file('kits/adjust/adjust-5/example/example-java') diff --git a/settings-kits.gradle b/settings-kits.gradle index 274572951..680d8e806 100644 --- a/settings-kits.gradle +++ b/settings-kits.gradle @@ -1,35 +1,39 @@ //keep things alphabetical like readme include ( - ':kits:adjust:adjust-5', - ':kits:adobe:adobe-5', - ':kits:adobemedia:adobemedia-5', - ':kits:appsflyer:appsflyer-6', - ':kits:apptentive:apptentive-6', - ':kits:apptimize:apptimize-3', + ':kits:android-adjust:adjust-5', + ':kits:android-adobe:adobe-5', + ':kits:android-adobemedia:adobemedia-5', + ':kits:android-appsflyer:appsflyer-6', + ':kits:android-apptentive:apptentive-6', + ':kits:android-apptimize:apptimize-3', //blueshift hosts kit - ':kits:braze:braze-38', - ':kits:braze:braze-39', - ':kits:braze:braze-40', - ':kits:braze:braze-41', - ':kits:branch:branch-5', - ':kits:clevertap:clevertap-7', - ':kits:comscore:comscore-6', - ':kits:ga:ga-23', - ':kits:ga4:ga4-23', - ':kits:iterable:iterable-3', - ':kits:kochava:kochava-5', - ':kits:localytics:localytics-6', - ':kits:leanplum:leanplum-7', + ':kits:android-braze:braze-38', + ':kits:android-braze:braze-39', + ':kits:android-braze:braze-40', + ':kits:android-braze:braze-41', + ':kits:android-branch:branch-5', + ':kits:android-clevertap:clevertap-7', + ':kits:android-comscore:comscore-6', + ':kits:android-ga:ga-23', + ':kits:android-ga4:ga4-23', + ':kits:android-iterable:iterable-3', + ':kits:android-kochava:kochava-5', + ':kits:android-localytics:localytics-6', + ':kits:android-leanplum:leanplum-7', //Neura hosts kit - ':kits:onetrust:onetrust', - ':kits:optimizely:optimizely-3', - ':kits:radar:radar-3', - ':kits:rokt:rokt', - ':kits:singular:singular-12', + ':kits:android-onetrust:onetrust', + ':kits:android-optimizely:optimizely-3', + ':kits:android-radar:radar-3', + ':kits:android-rokt:rokt', + ':kits:android-singular:singular-12', //Swrve hosts kit - // ':kits:urbanairship:urbanairship-20', // Kotlin 2.2.x -- built standalone (see ONBOARDING.md) + // ':kits:android-urbanairship:urbanairship-20', // Kotlin 2.2.x -- built standalone (see ONBOARDING.md) ) -project(':kits').getChildren().each { - proj -> proj.name = 'android-' + proj.name + +project(':kits').getChildren().each { vendorProject -> + def diskVendorName = vendorProject.name - 'android-' + vendorProject.children.each { kitProject -> + kitProject.projectDir = file("kits/${diskVendorName}/${kitProject.name}") + } } From 0d131ef84d8861323f4534bfe3662b7b36af29cc Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Tue, 23 Jun 2026 11:57:01 -0400 Subject: [PATCH 4/5] revert: restore settings-kits.gradle rename pattern Keep kit registration unchanged and rely on the existing android- rename so example modules and CI matrix paths continue to resolve correctly. --- .../example/example-java/build.gradle | 2 +- .../example/example-kotlin/build.gradle | 2 +- settings-kit-examples.gradle | 8 +-- settings-kits.gradle | 58 +++++++++---------- 4 files changed, 33 insertions(+), 37 deletions(-) diff --git a/kits/adjust/adjust-5/example/example-java/build.gradle b/kits/adjust/adjust-5/example/example-java/build.gradle index 7e2d02f5a..c18fdcc6a 100644 --- a/kits/adjust/adjust-5/example/example-java/build.gradle +++ b/kits/adjust/adjust-5/example/example-java/build.gradle @@ -27,7 +27,7 @@ android { } dependencies { - implementation project(':kits:android-adjust:adjust-5') + implementation project(':kits:adjust:adjust-5') implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.11.0' } diff --git a/kits/adjust/adjust-5/example/example-kotlin/build.gradle b/kits/adjust/adjust-5/example/example-kotlin/build.gradle index 1984b476a..1935716d1 100644 --- a/kits/adjust/adjust-5/example/example-kotlin/build.gradle +++ b/kits/adjust/adjust-5/example/example-kotlin/build.gradle @@ -32,7 +32,7 @@ android { } dependencies { - implementation project(':kits:android-adjust:adjust-5') + implementation project(':kits:adjust:adjust-5') implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.11.0' } diff --git a/settings-kit-examples.gradle b/settings-kit-examples.gradle index 6239eacda..5e7c97892 100644 --- a/settings-kit-examples.gradle +++ b/settings-kit-examples.gradle @@ -1,8 +1,8 @@ // CI-only settings for kit sample apps. Keeps example modules out of settings-kits.gradle. apply from: 'settings-kits.gradle' -include ':kits:android-adjust:adjust-5:example-kotlin', - ':kits:android-adjust:adjust-5:example-java' +include ':kits:adjust:adjust-5:example-kotlin', + ':kits:adjust:adjust-5:example-java' -project(':kits:android-adjust:adjust-5:example-kotlin').projectDir = file('kits/adjust/adjust-5/example/example-kotlin') -project(':kits:android-adjust:adjust-5:example-java').projectDir = file('kits/adjust/adjust-5/example/example-java') +project(':kits:adjust:adjust-5:example-kotlin').projectDir = file('kits/adjust/adjust-5/example/example-kotlin') +project(':kits:adjust:adjust-5:example-java').projectDir = file('kits/adjust/adjust-5/example/example-java') diff --git a/settings-kits.gradle b/settings-kits.gradle index 680d8e806..274572951 100644 --- a/settings-kits.gradle +++ b/settings-kits.gradle @@ -1,39 +1,35 @@ //keep things alphabetical like readme include ( - ':kits:android-adjust:adjust-5', - ':kits:android-adobe:adobe-5', - ':kits:android-adobemedia:adobemedia-5', - ':kits:android-appsflyer:appsflyer-6', - ':kits:android-apptentive:apptentive-6', - ':kits:android-apptimize:apptimize-3', + ':kits:adjust:adjust-5', + ':kits:adobe:adobe-5', + ':kits:adobemedia:adobemedia-5', + ':kits:appsflyer:appsflyer-6', + ':kits:apptentive:apptentive-6', + ':kits:apptimize:apptimize-3', //blueshift hosts kit - ':kits:android-braze:braze-38', - ':kits:android-braze:braze-39', - ':kits:android-braze:braze-40', - ':kits:android-braze:braze-41', - ':kits:android-branch:branch-5', - ':kits:android-clevertap:clevertap-7', - ':kits:android-comscore:comscore-6', - ':kits:android-ga:ga-23', - ':kits:android-ga4:ga4-23', - ':kits:android-iterable:iterable-3', - ':kits:android-kochava:kochava-5', - ':kits:android-localytics:localytics-6', - ':kits:android-leanplum:leanplum-7', + ':kits:braze:braze-38', + ':kits:braze:braze-39', + ':kits:braze:braze-40', + ':kits:braze:braze-41', + ':kits:branch:branch-5', + ':kits:clevertap:clevertap-7', + ':kits:comscore:comscore-6', + ':kits:ga:ga-23', + ':kits:ga4:ga4-23', + ':kits:iterable:iterable-3', + ':kits:kochava:kochava-5', + ':kits:localytics:localytics-6', + ':kits:leanplum:leanplum-7', //Neura hosts kit - ':kits:android-onetrust:onetrust', - ':kits:android-optimizely:optimizely-3', - ':kits:android-radar:radar-3', - ':kits:android-rokt:rokt', - ':kits:android-singular:singular-12', + ':kits:onetrust:onetrust', + ':kits:optimizely:optimizely-3', + ':kits:radar:radar-3', + ':kits:rokt:rokt', + ':kits:singular:singular-12', //Swrve hosts kit - // ':kits:android-urbanairship:urbanairship-20', // Kotlin 2.2.x -- built standalone (see ONBOARDING.md) + // ':kits:urbanairship:urbanairship-20', // Kotlin 2.2.x -- built standalone (see ONBOARDING.md) ) - -project(':kits').getChildren().each { vendorProject -> - def diskVendorName = vendorProject.name - 'android-' - vendorProject.children.each { kitProject -> - kitProject.projectDir = file("kits/${diskVendorName}/${kitProject.name}") - } +project(':kits').getChildren().each { + proj -> proj.name = 'android-' + proj.name } From 38b8cba3d5b9d9f58c167d9f64a45d4119cd3ee9 Mon Sep 17 00:00:00 2001 From: Denis Chilik Date: Tue, 23 Jun 2026 15:41:42 -0400 Subject: [PATCH 5/5] chore(kits): remove Adjust Java sample app Keep only the Kotlin example and drop Java example wiring from CI matrix and kit example settings. --- .../example/example-java/build.gradle | 33 ------------------- .../example-java/src/main/AndroidManifest.xml | 22 ------------- .../example/java/ExampleApplication.java | 24 -------------- .../adjust/example/java/MainActivity.java | 13 -------- .../res/drawable/ic_launcher_foreground.xml | 14 -------- .../src/main/res/layout/activity_main.xml | 14 -------- .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 --- .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 --- .../src/main/res/values/colors.xml | 4 --- .../src/main/res/values/strings.xml | 4 --- kits/matrix.json | 3 +- settings-kit-examples.gradle | 4 +-- 12 files changed, 2 insertions(+), 143 deletions(-) delete mode 100644 kits/adjust/adjust-5/example/example-java/build.gradle delete mode 100644 kits/adjust/adjust-5/example/example-java/src/main/AndroidManifest.xml delete mode 100644 kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/ExampleApplication.java delete mode 100644 kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/MainActivity.java delete mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/drawable/ic_launcher_foreground.xml delete mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/layout/activity_main.xml delete mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/values/colors.xml delete mode 100644 kits/adjust/adjust-5/example/example-java/src/main/res/values/strings.xml diff --git a/kits/adjust/adjust-5/example/example-java/build.gradle b/kits/adjust/adjust-5/example/example-java/build.gradle deleted file mode 100644 index c18fdcc6a..000000000 --- a/kits/adjust/adjust-5/example/example-java/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -plugins { - id 'com.android.application' -} - -android { - namespace 'com.mparticle.kits.adjust.example.java' - compileSdk 34 - - defaultConfig { - applicationId 'com.mparticle.kits.adjust.example.java' - minSdk 21 - targetSdk 34 - versionCode 1 - versionName '1.0' - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - - buildTypes { - release { - minifyEnabled false - } - } -} - -dependencies { - implementation project(':kits:adjust:adjust-5') - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.11.0' -} diff --git a/kits/adjust/adjust-5/example/example-java/src/main/AndroidManifest.xml b/kits/adjust/adjust-5/example/example-java/src/main/AndroidManifest.xml deleted file mode 100644 index 84b1637c1..000000000 --- a/kits/adjust/adjust-5/example/example-java/src/main/AndroidManifest.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - diff --git a/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/ExampleApplication.java b/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/ExampleApplication.java deleted file mode 100644 index 90e87a6f9..000000000 --- a/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/ExampleApplication.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.mparticle.kits.adjust.example.java; - -import android.app.Application; - -import com.mparticle.MPEvent; -import com.mparticle.MParticle; -import com.mparticle.MParticleOptions; - -public class ExampleApplication extends Application { - @Override - public void onCreate() { - super.onCreate(); - MParticleOptions options = - MParticleOptions.builder(this) - .credentials( - "REPLACE WITH YOUR MPARTICLE API KEY", - "REPLACE WITH YOUR MPARTICLE API SECRET") - .logLevel(MParticle.LogLevel.VERBOSE) - .build(); - MParticle.start(options); - MParticle.getInstance() - .logEvent(new MPEvent.Builder("foo", MParticle.EventType.Other).build()); - } -} diff --git a/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/MainActivity.java b/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/MainActivity.java deleted file mode 100644 index c22d1ac0d..000000000 --- a/kits/adjust/adjust-5/example/example-java/src/main/java/com/mparticle/kits/adjust/example/java/MainActivity.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mparticle.kits.adjust.example.java; - -import android.os.Bundle; - -import androidx.appcompat.app.AppCompatActivity; - -public class MainActivity extends AppCompatActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - } -} diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/drawable/ic_launcher_foreground.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 046177833..000000000 --- a/kits/adjust/adjust-5/example/example-java/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/layout/activity_main.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/layout/activity_main.xml deleted file mode 100644 index e2897e3ff..000000000 --- a/kits/adjust/adjust-5/example/example-java/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index a8a8fa551..000000000 --- a/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index a8a8fa551..000000000 --- a/kits/adjust/adjust-5/example/example-java/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/values/colors.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/values/colors.xml deleted file mode 100644 index f42ada656..000000000 --- a/kits/adjust/adjust-5/example/example-java/src/main/res/values/colors.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #FFFFFF - diff --git a/kits/adjust/adjust-5/example/example-java/src/main/res/values/strings.xml b/kits/adjust/adjust-5/example/example-java/src/main/res/values/strings.xml deleted file mode 100644 index c0e4daa69..000000000 --- a/kits/adjust/adjust-5/example/example-java/src/main/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Adjust Kit Java Example - diff --git a/kits/matrix.json b/kits/matrix.json index c00911078..6f99841b3 100644 --- a/kits/matrix.json +++ b/kits/matrix.json @@ -3,7 +3,6 @@ "name": "adjust-5", "local_path": "kits/adjust/adjust-5", "kit_project": ":kits:android-adjust:adjust-5", - "example_kotlin_project": ":kits:android-adjust:adjust-5:example-kotlin", - "example_java_project": ":kits:android-adjust:adjust-5:example-java" + "example_kotlin_project": ":kits:android-adjust:adjust-5:example-kotlin" } ] diff --git a/settings-kit-examples.gradle b/settings-kit-examples.gradle index 5e7c97892..aeab3bc8c 100644 --- a/settings-kit-examples.gradle +++ b/settings-kit-examples.gradle @@ -1,8 +1,6 @@ // CI-only settings for kit sample apps. Keeps example modules out of settings-kits.gradle. apply from: 'settings-kits.gradle' -include ':kits:adjust:adjust-5:example-kotlin', - ':kits:adjust:adjust-5:example-java' +include ':kits:adjust:adjust-5:example-kotlin' project(':kits:adjust:adjust-5:example-kotlin').projectDir = file('kits/adjust/adjust-5/example/example-kotlin') -project(':kits:adjust:adjust-5:example-java').projectDir = file('kits/adjust/adjust-5/example/example-java')