diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index b15a2a642..1a390b2fc 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -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: @@ -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" @@ -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: @@ -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 @@ -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: @@ -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 @@ -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: @@ -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: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 593d42f5c..8cfe0ecda 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -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: @@ -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: @@ -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" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9676b0ee8..b185ad906 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: @@ -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 @@ -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: @@ -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 diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 20ab664aa..000000000 --- a/.gitmodules +++ /dev/null @@ -1,36 +0,0 @@ -[submodule "kits/apteligent-kit"] - path = kits/apteligent-kit - url = git@github.com:mParticle-integrations/mparticle-android-integration-apteligent.git -[submodule "kits/button-kit"] - path = kits/button-kit - url = git@github.com:mparticle-integrations/mparticle-android-integration-button.git -[submodule "kits/example-kit"] - path = kits/example-kit - url = git@github.com:mparticle-integrations/mparticle-android-integration-example.git -[submodule "kits/flurry-kit"] - path = kits/flurry-kit - url = git@github.com:mParticle-integrations/mparticle-android-integration-flurry.git -[submodule "kits/foresee-kit"] - path = kits/foresee-kit - url = git@github.com:mparticle-integrations/mparticle-android-integration-foresee.git -[submodule "kits/pilgrim-kit"] - path = kits/pilgrim-kit - url = git@github.com:mparticle-integrations/mparticle-android-integration-pilgrim.git -[submodule "kits/responsys-kit"] - path = kits/responsys-kit - url = git@github.com:mparticle-integrations/mparticle-android-integration-responsys.git -[submodule "kits/revealmobile-kit"] - path = kits/revealmobile-kit - url = git@github.com:mparticle-integrations/mparticle-android-integration-revealmobile.git -[submodule "kits/skyhook-kit"] - path = kits/skyhook-kit - url = git@github.com:mparticle-integrations/mparticle-android-integration-skyhook.git -[submodule "kits/taplytics-kit"] - path = kits/taplytics-kit - url = git@github.com:mparticle-integrations/mparticle-android-integration-taplytics.git -[submodule "kits/tune-kit"] - path = kits/tune-kit - url = git@github.com:mParticle-integrations/mparticle-android-integration-tune.git -[submodule "kits/wootric-kit"] - path = kits/wootric-kit - url = git@github.com:mParticle-integrations/mparticle-android-integration-wootric.git diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 075b2a8aa..22c05d828 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/ONBOARDING.md b/ONBOARDING.md index fd3662db6..ecf8d332b 100644 --- a/ONBOARDING.md +++ b/ONBOARDING.md @@ -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 @@ -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 diff --git a/kits/apteligent-kit b/kits/apteligent-kit deleted file mode 160000 index 91afc5c1c..000000000 --- a/kits/apteligent-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 91afc5c1c2b84bb331d9c5a38600404e9862e86a diff --git a/kits/button-kit b/kits/button-kit deleted file mode 160000 index 5155ed507..000000000 --- a/kits/button-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5155ed5075a4f3410988bebaf872db1ebde8e579 diff --git a/kits/example-kit b/kits/example-kit deleted file mode 160000 index 11deff90e..000000000 --- a/kits/example-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 11deff90e10ed75f227a2f8e223c64e1b2ce7c6d diff --git a/kits/flurry-kit b/kits/flurry-kit deleted file mode 160000 index c335775fe..000000000 --- a/kits/flurry-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c335775fe96534ac3b03fd4a4dba32f3b2216099 diff --git a/kits/foresee-kit b/kits/foresee-kit deleted file mode 160000 index 3c7003cf5..000000000 --- a/kits/foresee-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3c7003cf5545e1a5a21fd3effb5d782854302bf1 diff --git a/kits/pilgrim-kit b/kits/pilgrim-kit deleted file mode 160000 index 3431c8081..000000000 --- a/kits/pilgrim-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3431c808125239361ccd708c41782510613955d6 diff --git a/kits/responsys-kit b/kits/responsys-kit deleted file mode 160000 index 62c6e15ea..000000000 --- a/kits/responsys-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 62c6e15ea46d7e37b4e7f6b0ac52ad8c20d8b5e4 diff --git a/kits/revealmobile-kit b/kits/revealmobile-kit deleted file mode 160000 index bcabe5b4b..000000000 --- a/kits/revealmobile-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bcabe5b4bc0fc95bdd108677c17fa86f0fbf8939 diff --git a/kits/skyhook-kit b/kits/skyhook-kit deleted file mode 160000 index 19b15b725..000000000 --- a/kits/skyhook-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 19b15b72571ec5e9cf314427c11a8e1876ed2332 diff --git a/kits/taplytics-kit b/kits/taplytics-kit deleted file mode 160000 index 4654afc22..000000000 --- a/kits/taplytics-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4654afc22588de874367621198b67ad4db8d1cec diff --git a/kits/tune-kit b/kits/tune-kit deleted file mode 160000 index b898766ea..000000000 --- a/kits/tune-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b898766eae0d47a51b7db5314b0036265eae5804 diff --git a/kits/wootric-kit b/kits/wootric-kit deleted file mode 160000 index 1c0b1efb2..000000000 --- a/kits/wootric-kit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c0b1efb2ee55ce0120b144fee5b94272e2f4324 diff --git a/settings-kits.gradle b/settings-kits.gradle index 7f42c673f..a12f3c55a 100644 --- a/settings-kits.gradle +++ b/settings-kits.gradle @@ -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', @@ -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