Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ jobs:
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
repository: mparticle/mparticle-android-sdk
ref: ${{ inputs.branch_name }}
submodules: recursive
- name: "Import GPG Key"
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec #v6.0
with:
Expand All @@ -62,13 +61,6 @@ jobs:
run: |
git checkout -b regression/${{ github.run_number }}
git push origin regression/${{ github.run_number }}
- name: "Commit Kit Updates"
run: |
git submodule foreach "git fetch; git reset --hard origin/main";
git add .
git diff-index --quiet HEAD || git commit -m 'chore: Update Submodules'
- name: "Push kit updates to release branch"
run: git push origin regression/${{ github.run_number }}

# instrumented-tests:
# name: "Instrumented Tests"
Expand Down Expand Up @@ -232,7 +224,6 @@ jobs:
uses: actions/checkout@v6.0.2
with:
ref: regression/${{ github.run_number }}
submodules: recursive
- name: "Install JDK 17"
uses: actions/setup-java@v5
with:
Expand All @@ -245,8 +236,8 @@ jobs:
run: ./gradlew publishReleaseLocal
- name: "Run Android Kit Lint"
run: ./gradlew publishReleaseLocal -c settings-kits.gradle lint
- name: "Run Isolated Kit Lint (urbanairship-kit)"
working-directory: kits/urbanairship-kit
- name: "Run Isolated Kit Lint (urbanairship)"
working-directory: kits/urbanairship/urbanairship-20
run: ./gradlew lint
- name: "Archive Test Results"
uses: actions/upload-artifact@v7
Expand All @@ -271,7 +262,6 @@ jobs:
uses: actions/checkout@v6.0.2
with:
ref: regression/${{ github.run_number }}
submodules: recursive
- name: "Install JDK 17"
uses: actions/setup-java@v5
with:
Expand All @@ -284,8 +274,8 @@ jobs:
run: ./gradlew publishReleaseLocal
- name: "Run Android Kit Kotlin Lint"
run: ./gradlew publishReleaseLocal -c settings-kits.gradle ktlintCheck
- name: "Run Isolated Kit Kotlin Lint (urbanairship-kit)"
working-directory: kits/urbanairship-kit
- name: "Run Isolated Kit Kotlin Lint (urbanairship)"
working-directory: kits/urbanairship/urbanairship-20
run: ./gradlew ktlintCheck
- name: "Archive Test Results"
uses: actions/upload-artifact@v7
Expand Down Expand Up @@ -315,7 +305,6 @@ jobs:
with:
repository: mparticle/mparticle-android-sdk
ref: regression/${{ github.run_number }}
submodules: recursive
- name: "Install JDK 17"
uses: actions/setup-java@v5
with:
Expand All @@ -326,8 +315,8 @@ jobs:
run: ./gradlew -PisRelease=true clean publishReleaseLocal
- name: "Test Kits"
run: ./gradlew -PisRelease=true clean testRelease publishReleaseLocal -c settings-kits.gradle
- name: "Test Isolated Kits (urbanairship-kit)"
working-directory: kits/urbanairship-kit
- name: "Test Isolated Kits (urbanairship)"
working-directory: kits/urbanairship/urbanairship-20
run: ./gradlew -PisRelease=true clean testRelease publishReleaseLocal

semantic-release-dryrun:
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ jobs:
steps:
- name: "Checkout Branch"
uses: actions/checkout@v6.0.2
with:
submodules: recursive
- name: "Install JDK 17"
uses: actions/setup-java@v5
with:
Expand All @@ -127,8 +125,6 @@ jobs:
steps:
- name: "Checkout Branch"
uses: actions/checkout@v6.0.2
with:
submodules: recursive
- name: "Install JDK 17"
uses: actions/setup-java@v5
with:
Expand Down Expand Up @@ -160,16 +156,11 @@ jobs:
steps:
- name: "Checkout Branch"
uses: actions/checkout@v6.0.2
with:
submodules: recursive
fetch-depth: 0
- name: "Install JDK 17"
uses: actions/setup-java@v5
with:
distribution: "zulu"
java-version: "17"
- name: "Get Latest Kits"
run: git submodule foreach "git rebase main"
- name: "Generate Core Release Build"
run: ./gradlew -PisRelease=true publishLocal
- name: "Run Kit-Base Release Tests and Build"
Expand Down
13 changes: 2 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
repository: mparticle/mparticle-android-sdk
ref: main
submodules: recursive
- name: "Import GPG Key"
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec #v6.0
with:
Expand All @@ -49,13 +48,6 @@ jobs:
run: |
git checkout -b release/${{ github.run_number }}
git push origin release/${{ github.run_number }}
- name: "Commit Kit Updates"
run: |
git submodule foreach "git fetch; git reset --hard origin/main";
git add .
git diff-index --quiet HEAD || git commit -m 'chore: Update submodules'
- name: "Push kit updates to release branch"
run: git push origin release/${{ github.run_number }}

regression-check:
needs: create-release-branch
Expand Down Expand Up @@ -135,7 +127,6 @@ jobs:
with:
repository: mparticle/mparticle-android-sdk
ref: release/${{ github.run_number }}
submodules: recursive
- name: "Install JDK 17"
uses: actions/setup-java@v5
with:
Expand All @@ -155,9 +146,9 @@ jobs:
if: ${{ github.event.inputs.dryRun == 'false'}}
id: sdk-version
run: echo "version=$(./gradlew -PisRelease=true -q properties | grep '^version:' | awk '{print $2}')" >> $GITHUB_OUTPUT
- name: "Publish Isolated Kits (urbanairship-kit)"
- name: "Publish Isolated Kits (urbanairship)"
if: ${{ github.event.inputs.dryRun == 'false'}}
working-directory: kits/urbanairship-kit
working-directory: kits/urbanairship/urbanairship-20
run: ./gradlew -PisRelease=true -Pversion=${{ steps.sdk-version.outputs.version }} publishReleasePublicationToMavenRepository --stacktrace

# Temporary workaround: https://central.sonatype.org/publish/publish-portal-ossrh-staging-api/#ensuring-deployment-visibility-in-the-central-publisher-portal
Expand Down
36 changes: 0 additions & 36 deletions .gitmodules

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ for details. Before submitting a PR that affects core APIs, verify isolated
kits also build:

```bash
cd kits/urbanairship-kit && ./gradlew testRelease
cd kits/urbanairship/urbanairship-20 && ./gradlew testRelease
```

### Reporting Bugs
Expand Down
15 changes: 4 additions & 11 deletions ONBOARDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,10 @@ version in the **Gradle JDK** dropdown menu.
Remember to close and reopen your project after you've made your changes or the error message may
persist.

### Downloading the mParticle Kits
### mParticle Kits

Now we will download the different available Kits which are developed as individual submodules each
having a dedicated repository. First make sure you have set both a SSH key and GPG key in your
GitHub account, SSH is used for authentication while GPG is used for signing tags and commits.

Now type the following commands `git submodule init` (creates the local configuration file for the
submodules). followed by `git submodule update --recursive` (updates all available submodules).

Or you can do it in one line with `git submodule update --init`
All kits are included in the monorepo under the `kits/` directory. Clone the repository and you
will have the full SDK with all available kits. No submodule initialization is required.

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

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

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

Expand Down
1 change: 0 additions & 1 deletion kits/apteligent-kit
Submodule apteligent-kit deleted from 91afc5
1 change: 0 additions & 1 deletion kits/button-kit
Submodule button-kit deleted from 5155ed
1 change: 0 additions & 1 deletion kits/example-kit
Submodule example-kit deleted from 11deff
1 change: 0 additions & 1 deletion kits/flurry-kit
Submodule flurry-kit deleted from c33577
1 change: 0 additions & 1 deletion kits/foresee-kit
Submodule foresee-kit deleted from 3c7003
1 change: 0 additions & 1 deletion kits/pilgrim-kit
Submodule pilgrim-kit deleted from 3431c8
1 change: 0 additions & 1 deletion kits/responsys-kit
Submodule responsys-kit deleted from 62c6e1
1 change: 0 additions & 1 deletion kits/revealmobile-kit
Submodule revealmobile-kit deleted from bcabe5
1 change: 0 additions & 1 deletion kits/skyhook-kit
Submodule skyhook-kit deleted from 19b15b
1 change: 0 additions & 1 deletion kits/taplytics-kit
Submodule taplytics-kit deleted from 4654af
1 change: 0 additions & 1 deletion kits/tune-kit
Submodule tune-kit deleted from b89876
1 change: 0 additions & 1 deletion kits/wootric-kit
Submodule wootric-kit deleted from 1c0b1e
12 changes: 0 additions & 12 deletions settings-kits.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,11 @@ include (
':kits:appsflyer:appsflyer-6',
':kits:apptentive:apptentive-6',
':kits:apptimize:apptimize-3',
':kits:apteligent-kit',
//blueshift hosts kit
':kits:braze:braze-38',
':kits:branch:branch-5',
':kits:button-kit',
':kits:clevertap:clevertap-7',
':kits:comscore:comscore-6',
':kits:flurry-kit',
':kits:foresee-kit',
':kits:ga:ga-23',
':kits:ga4:ga4-23',
':kits:iterable:iterable-3',
Expand All @@ -25,19 +21,11 @@ include (
//Neura hosts kit
':kits:onetrust:onetrust',
':kits:optimizely:optimizely-3',
// ':kits:pilgrim-kit',
':kits:radar:radar-3',
':kits:responsys-kit',
':kits:revealmobile-kit',
':kits:rokt:rokt',
':kits:singular:singular-12',
':kits:skyhook-kit',
//Swrve hosts kit
':kits:taplytics-kit',
':kits:tune-kit',
// ':kits:urbanairship:urbanairship-20', // Kotlin 2.2.x -- built standalone (see ONBOARDING.md)
':kits:wootric-kit',
':kits:example-kit'
)
project(':kits').getChildren().each {
proj -> proj.name = 'android-' + proj.name
Expand Down
Loading