Skip to content

Commit cd24c40

Browse files
committed
chore: remove submodules, migrate to monorepo
- Remove .gitmodules and 12 kit submodules (apteligent, button, example, flurry, foresee, pilgrim, responsys, revealmobile, skyhook, taplytics, tune, wootric) - Update settings-kits.gradle to remove deleted kit references - Remove submodule steps from CI (pull-request.yml, release.yml, daily.yml) - Update ONBOARDING.md: kits are in monorepo, no submodule init needed - Update CONTRIBUTING.md: urbanairship path - Update urbanairship paths in release.yml and daily.yml Made-with: Cursor
1 parent 4f0c481 commit cd24c40

19 files changed

Lines changed: 13 additions & 109 deletions

.github/workflows/daily.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
5151
repository: mparticle/mparticle-android-sdk
5252
ref: ${{ inputs.branch_name }}
53-
submodules: recursive
5453
- name: "Import GPG Key"
5554
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec #v6.0
5655
with:
@@ -62,13 +61,6 @@ jobs:
6261
run: |
6362
git checkout -b regression/${{ github.run_number }}
6463
git push origin regression/${{ github.run_number }}
65-
- name: "Commit Kit Updates"
66-
run: |
67-
git submodule foreach "git fetch; git reset --hard origin/main";
68-
git add .
69-
git diff-index --quiet HEAD || git commit -m 'chore: Update Submodules'
70-
- name: "Push kit updates to release branch"
71-
run: git push origin regression/${{ github.run_number }}
7264
7365
# instrumented-tests:
7466
# name: "Instrumented Tests"
@@ -232,7 +224,6 @@ jobs:
232224
uses: actions/checkout@v6.0.2
233225
with:
234226
ref: regression/${{ github.run_number }}
235-
submodules: recursive
236227
- name: "Install JDK 17"
237228
uses: actions/setup-java@v5
238229
with:
@@ -245,8 +236,8 @@ jobs:
245236
run: ./gradlew publishReleaseLocal
246237
- name: "Run Android Kit Lint"
247238
run: ./gradlew publishReleaseLocal -c settings-kits.gradle lint
248-
- name: "Run Isolated Kit Lint (urbanairship-kit)"
249-
working-directory: kits/urbanairship-kit
239+
- name: "Run Isolated Kit Lint (urbanairship)"
240+
working-directory: kits/urbanairship/urbanairship-20
250241
run: ./gradlew lint
251242
- name: "Archive Test Results"
252243
uses: actions/upload-artifact@v7
@@ -271,7 +262,6 @@ jobs:
271262
uses: actions/checkout@v6.0.2
272263
with:
273264
ref: regression/${{ github.run_number }}
274-
submodules: recursive
275265
- name: "Install JDK 17"
276266
uses: actions/setup-java@v5
277267
with:
@@ -284,8 +274,8 @@ jobs:
284274
run: ./gradlew publishReleaseLocal
285275
- name: "Run Android Kit Kotlin Lint"
286276
run: ./gradlew publishReleaseLocal -c settings-kits.gradle ktlintCheck
287-
- name: "Run Isolated Kit Kotlin Lint (urbanairship-kit)"
288-
working-directory: kits/urbanairship-kit
277+
- name: "Run Isolated Kit Kotlin Lint (urbanairship)"
278+
working-directory: kits/urbanairship/urbanairship-20
289279
run: ./gradlew ktlintCheck
290280
- name: "Archive Test Results"
291281
uses: actions/upload-artifact@v7
@@ -315,7 +305,6 @@ jobs:
315305
with:
316306
repository: mparticle/mparticle-android-sdk
317307
ref: regression/${{ github.run_number }}
318-
submodules: recursive
319308
- name: "Install JDK 17"
320309
uses: actions/setup-java@v5
321310
with:
@@ -326,8 +315,8 @@ jobs:
326315
run: ./gradlew -PisRelease=true clean publishReleaseLocal
327316
- name: "Test Kits"
328317
run: ./gradlew -PisRelease=true clean testRelease publishReleaseLocal -c settings-kits.gradle
329-
- name: "Test Isolated Kits (urbanairship-kit)"
330-
working-directory: kits/urbanairship-kit
318+
- name: "Test Isolated Kits (urbanairship)"
319+
working-directory: kits/urbanairship/urbanairship-20
331320
run: ./gradlew -PisRelease=true clean testRelease publishReleaseLocal
332321

333322
semantic-release-dryrun:

.github/workflows/pull-request.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ jobs:
100100
steps:
101101
- name: "Checkout Branch"
102102
uses: actions/checkout@v6.0.2
103-
with:
104-
submodules: recursive
105103
- name: "Install JDK 17"
106104
uses: actions/setup-java@v5
107105
with:
@@ -127,8 +125,6 @@ jobs:
127125
steps:
128126
- name: "Checkout Branch"
129127
uses: actions/checkout@v6.0.2
130-
with:
131-
submodules: recursive
132128
- name: "Install JDK 17"
133129
uses: actions/setup-java@v5
134130
with:
@@ -160,16 +156,11 @@ jobs:
160156
steps:
161157
- name: "Checkout Branch"
162158
uses: actions/checkout@v6.0.2
163-
with:
164-
submodules: recursive
165-
fetch-depth: 0
166159
- name: "Install JDK 17"
167160
uses: actions/setup-java@v5
168161
with:
169162
distribution: "zulu"
170163
java-version: "17"
171-
- name: "Get Latest Kits"
172-
run: git submodule foreach "git rebase main"
173164
- name: "Generate Core Release Build"
174165
run: ./gradlew -PisRelease=true publishLocal
175166
- name: "Run Kit-Base Release Tests and Build"

.github/workflows/release.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ jobs:
3737
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
3838
repository: mparticle/mparticle-android-sdk
3939
ref: main
40-
submodules: recursive
4140
- name: "Import GPG Key"
4241
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec #v6.0
4342
with:
@@ -49,13 +48,6 @@ jobs:
4948
run: |
5049
git checkout -b release/${{ github.run_number }}
5150
git push origin release/${{ github.run_number }}
52-
- name: "Commit Kit Updates"
53-
run: |
54-
git submodule foreach "git fetch; git reset --hard origin/main";
55-
git add .
56-
git diff-index --quiet HEAD || git commit -m 'chore: Update submodules'
57-
- name: "Push kit updates to release branch"
58-
run: git push origin release/${{ github.run_number }}
5951
6052
regression-check:
6153
needs: create-release-branch
@@ -135,7 +127,6 @@ jobs:
135127
with:
136128
repository: mparticle/mparticle-android-sdk
137129
ref: release/${{ github.run_number }}
138-
submodules: recursive
139130
- name: "Install JDK 17"
140131
uses: actions/setup-java@v5
141132
with:
@@ -155,9 +146,9 @@ jobs:
155146
if: ${{ github.event.inputs.dryRun == 'false'}}
156147
id: sdk-version
157148
run: echo "version=$(./gradlew -PisRelease=true -q properties | grep '^version:' | awk '{print $2}')" >> $GITHUB_OUTPUT
158-
- name: "Publish Isolated Kits (urbanairship-kit)"
149+
- name: "Publish Isolated Kits (urbanairship)"
159150
if: ${{ github.event.inputs.dryRun == 'false'}}
160-
working-directory: kits/urbanairship-kit
151+
working-directory: kits/urbanairship/urbanairship-20
161152
run: ./gradlew -PisRelease=true -Pversion=${{ steps.sdk-version.outputs.version }} publishReleasePublicationToMavenRepository --stacktrace
162153

163154
# Temporary workaround: https://central.sonatype.org/publish/publish-portal-ossrh-staging-api/#ensuring-deployment-visibility-in-the-central-publisher-portal

.gitmodules

Lines changed: 0 additions & 36 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ for details. Before submitting a PR that affects core APIs, verify isolated
8585
kits also build:
8686

8787
```bash
88-
cd kits/urbanairship-kit && ./gradlew testRelease
88+
cd kits/urbanairship/urbanairship-20 && ./gradlew testRelease
8989
```
9090

9191
### Reporting Bugs

ONBOARDING.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,10 @@ version in the **Gradle JDK** dropdown menu.
6969
Remember to close and reopen your project after you've made your changes or the error message may
7070
persist.
7171

72-
### Downloading the mParticle Kits
72+
### mParticle Kits
7373

74-
Now we will download the different available Kits which are developed as individual submodules each
75-
having a dedicated repository. First make sure you have set both a SSH key and GPG key in your
76-
GitHub account, SSH is used for authentication while GPG is used for signing tags and commits.
77-
78-
Now type the following commands `git submodule init` (creates the local configuration file for the
79-
submodules). followed by `git submodule update --recursive` (updates all available submodules).
80-
81-
Or you can do it in one line with `git submodule update --init`
74+
All kits are included in the monorepo under the `kits/` directory. Clone the repository and you
75+
will have the full SDK with all available kits. No submodule initialization is required.
8276

8377
An error regarding the Javadoc file generation, **Illegal Package Name** may come up referencing
8478
some files with the .kt extension, a current quick fix for this is adding the following code in
@@ -90,8 +84,7 @@ tasks.withType(Javadoc) {
9084
}
9185
```
9286

93-
Once you have run both commands you should see your newly populated kit files easily in the Project
94-
view -> **Kits** folder.
87+
Kit files are located in the Project view -> **Kits** folder.
9588

9689
### Building and publishing core modules to the Maven Local Repository
9790

kits/apteligent-kit

Lines changed: 0 additions & 1 deletion
This file was deleted.

kits/button-kit

Lines changed: 0 additions & 1 deletion
This file was deleted.

kits/example-kit

Lines changed: 0 additions & 1 deletion
This file was deleted.

kits/flurry-kit

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)