Skip to content

Commit 5357b3c

Browse files
jamesnroktjamesnrokt
committed
Merge branch 'feat/removing-deprecations' of https://github.com/mParticle/mparticle-android-sdk into feat/removing-deprecations
2 parents 7ecadd0 + d6e64b4 commit 5357b3c

42 files changed

Lines changed: 514 additions & 791 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/cross-platform-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: "Checkout Cross Platform Tests Repo"
13-
uses: actions/checkout@v6.0.2
13+
uses: actions/checkout@v6
1414
with:
1515
repository: mParticle/crossplatform-sdk-tests
1616

1717
- name: "Checkout Android SDK Branch"
18-
uses: actions/checkout@v6.0.2
18+
uses: actions/checkout@v6
1919
with:
2020
repository: ${{github.event.pull_request.head.repo.full_name}}
2121
ref: ${{github.head_ref}}

‎.github/workflows/daily.yml‎

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@ jobs:
4545
GIT_COMMITTER_EMAIL: developers@mparticle.com
4646
steps:
4747
- name: "Clone branch"
48-
uses: actions/checkout@v6.0.2
48+
uses: actions/checkout@v6
4949
with:
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"
@@ -77,7 +69,7 @@ jobs:
7769
# needs: create-regression-branch
7870
# steps:
7971
# - name: "Checkout future release branch"
80-
# uses: actions/checkout@v6.0.2
72+
# uses: actions/checkout@v6
8173
# with:
8274
# repository: mparticle/mparticle-android-sdk
8375
# ref: regression/${{ github.run_number }}
@@ -110,7 +102,7 @@ jobs:
110102
# needs: create-regression-branch
111103
# steps:
112104
# - name: "Checkout Branch"
113-
# uses: actions/checkout@v6.0.2
105+
# uses: actions/checkout@v6
114106
# with:
115107
# repository: mparticle/mparticle-android-sdk
116108
# ref: regression/${{ github.run_number }}
@@ -200,7 +192,7 @@ jobs:
200192
needs: create-regression-branch
201193
steps:
202194
- name: "Checkout future release branch"
203-
uses: actions/checkout@v6.0.2
195+
uses: actions/checkout@v6
204196
with:
205197
repository: mparticle/mparticle-android-sdk
206198
ref: regression/${{ github.run_number }}
@@ -229,10 +221,9 @@ jobs:
229221
needs: create-regression-branch
230222
steps:
231223
- name: "Checkout Branch"
232-
uses: actions/checkout@v6.0.2
224+
uses: actions/checkout@v6
233225
with:
234226
ref: regression/${{ github.run_number }}
235-
submodules: recursive
236227
- name: "Install JDK 17"
237228
uses: actions/setup-java@v5
238229
with:
@@ -242,11 +233,11 @@ jobs:
242233
- name: "Run Android Core SDK Lint"
243234
run: ./gradlew lint
244235
- name: "Setup Android Kit Lint"
245-
run: ./gradlew publishReleaseLocal
236+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
246237
- name: "Run Android Kit Lint"
247-
run: ./gradlew publishReleaseLocal -c settings-kits.gradle lint
238+
run: ./gradlew lint -c settings-kits.gradle
248239
- name: "Run Isolated Kit Lint (urbanairship-kit)"
249-
working-directory: kits/urbanairship-kit
240+
working-directory: kits/urbanairship/urbanairship-20
250241
run: ./gradlew lint
251242
- name: "Archive Test Results"
252243
uses: actions/upload-artifact@v7
@@ -268,10 +259,9 @@ jobs:
268259
needs: create-regression-branch
269260
steps:
270261
- name: "Checkout Branch"
271-
uses: actions/checkout@v6.0.2
262+
uses: actions/checkout@v6
272263
with:
273264
ref: regression/${{ github.run_number }}
274-
submodules: recursive
275265
- name: "Install JDK 17"
276266
uses: actions/setup-java@v5
277267
with:
@@ -281,11 +271,11 @@ jobs:
281271
- name: "Run Android Core SDK Kotlin Lint"
282272
run: ./gradlew ktlintCheck
283273
- name: "Setup Android Kit Kotlin Lint"
284-
run: ./gradlew publishReleaseLocal
274+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
285275
- name: "Run Android Kit Kotlin Lint"
286-
run: ./gradlew publishReleaseLocal -c settings-kits.gradle ktlintCheck
276+
run: ./gradlew ktlintCheck -c settings-kits.gradle
287277
- name: "Run Isolated Kit Kotlin Lint (urbanairship-kit)"
288-
working-directory: kits/urbanairship-kit
278+
working-directory: kits/urbanairship/urbanairship-20
289279
run: ./gradlew ktlintCheck
290280
- name: "Archive Test Results"
291281
uses: actions/upload-artifact@v7
@@ -311,24 +301,23 @@ jobs:
311301
GIT_COMMITTER_EMAIL: developers@mparticle.com
312302
steps:
313303
- name: "Checkout future release branch"
314-
uses: actions/checkout@v6.0.2
304+
uses: actions/checkout@v6
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:
322311
distribution: "zulu"
323312
java-version: "17"
324313
cache: "gradle"
325314
- name: "Build Android Core"
326-
run: ./gradlew -PisRelease=true clean publishReleaseLocal
315+
run: ./gradlew clean publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
327316
- name: "Test Kits"
328-
run: ./gradlew -PisRelease=true clean testRelease publishReleaseLocal -c settings-kits.gradle
317+
run: ./gradlew clean testRelease -c settings-kits.gradle
329318
- name: "Test Isolated Kits (urbanairship-kit)"
330-
working-directory: kits/urbanairship-kit
331-
run: ./gradlew -PisRelease=true clean testRelease publishReleaseLocal
319+
working-directory: kits/urbanairship/urbanairship-20
320+
run: ./gradlew clean testRelease
332321

333322
semantic-release-dryrun:
334323
name: "Test Semantic Release - Dry Run"
@@ -342,7 +331,7 @@ jobs:
342331
GIT_COMMITTER_EMAIL: developers@mparticle.com
343332
steps:
344333
- name: "Checkout public main branch"
345-
uses: actions/checkout@v6.0.2
334+
uses: actions/checkout@v6
346335
with:
347336
fetch-depth: 0
348337
ref: main
@@ -373,7 +362,7 @@ jobs:
373362
GIT_COMMITTER_EMAIL: developers@mparticle.com
374363
steps:
375364
- name: "Checkout repo"
376-
uses: actions/checkout@v6.0.2
365+
uses: actions/checkout@v6
377366
with:
378367
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
379368
fetch-depth: 0

‎.github/workflows/pull-request.yml‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
runs-on: ubuntu-latest
7676
steps:
7777
- name: "Checkout Branch"
78-
uses: actions/checkout@v6.0.2
78+
uses: actions/checkout@v6
7979
- name: "Install JDK 17"
8080
uses: actions/setup-java@v5
8181
with:
@@ -95,13 +95,11 @@ jobs:
9595

9696
lint-checks:
9797
name: "Lint Checks"
98-
timeout-minutes: 15
98+
timeout-minutes: 20
9999
runs-on: macos-latest
100100
steps:
101101
- name: "Checkout Branch"
102-
uses: actions/checkout@v6.0.2
103-
with:
104-
submodules: recursive
102+
uses: actions/checkout@v6
105103
- name: "Install JDK 17"
106104
uses: actions/setup-java@v5
107105
with:
@@ -110,7 +108,7 @@ jobs:
110108
- name: "Run Android Core SDK Lint"
111109
run: ./gradlew lint
112110
- name: "Setup Android Kit Lint"
113-
run: ./gradlew publishReleaseLocal
111+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
114112
- name: "Run Android Kit Lint"
115113
run: ./gradlew -c settings-kits.gradle lint
116114
- name: "Archive Lint Test Results"
@@ -126,9 +124,7 @@ jobs:
126124
runs-on: macos-latest
127125
steps:
128126
- name: "Checkout Branch"
129-
uses: actions/checkout@v6.0.2
130-
with:
131-
submodules: recursive
127+
uses: actions/checkout@v6
132128
- name: "Install JDK 17"
133129
uses: actions/setup-java@v5
134130
with:
@@ -137,7 +133,7 @@ jobs:
137133
- name: "Run Android Core SDK Kotlin Lint"
138134
run: ./gradlew ktlintCheck
139135
- name: "Setup Android Kit Kotlin Lint"
140-
run: ./gradlew publishReleaseLocal
136+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
141137
- name: "Run Android Kit Kotlin Lint"
142138
run: ./gradlew -c settings-kits.gradle ktlintCheck
143139
- name: "Archive Kotlin Lint Test Results"
@@ -159,23 +155,18 @@ jobs:
159155
if: github.event_name == 'pull_request'
160156
steps:
161157
- name: "Checkout Branch"
162-
uses: actions/checkout@v6.0.2
163-
with:
164-
submodules: recursive
165-
fetch-depth: 0
158+
uses: actions/checkout@v6
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"
174-
run: ./gradlew -PisRelease=true publishLocal
165+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)
175166
- name: "Run Kit-Base Release Tests and Build"
176-
run: ./gradlew -PisRelease=true :android-kit-base:testRelease
167+
run: ./gradlew :android-kit-base:testRelease -PVERSION=$(head -n 1 VERSION)
177168
- name: "Run Kit Release Tests and Build"
178-
run: ./gradlew -PisRelease=true -p kits testRelease -c ../settings-kits.gradle
169+
run: ./gradlew -p kits testRelease -c ../settings-kits.gradle -PVERSION=$(head -n 1 VERSION)
179170
- name: "Run Isolated Kit Compatibility Tests (urbanairship)"
180171
working-directory: kits/urbanairship/urbanairship-20
181172
run: ./gradlew -PisRelease=true testRelease

‎.github/workflows/release-draft.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: Release – Draft
2+
3+
on:
4+
workflow_dispatch: # checkov:skip=CKV_GHA_7
5+
inputs:
6+
bump-type:
7+
description: "Specify if the version should be bumped as patch, minor, or major"
8+
required: true
9+
type: choice
10+
options:
11+
- patch
12+
- minor
13+
- major
14+
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: true
18+
19+
permissions:
20+
contents: write
21+
pull-requests: write
22+
23+
jobs:
24+
publish-draft-release:
25+
runs-on: ubuntu-latest
26+
env:
27+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY }}
28+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_PASSWORD }}
29+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
30+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
31+
steps:
32+
- name: Checkout repository
33+
uses: actions/checkout@v6
34+
with:
35+
fetch-depth: 0
36+
37+
- name: Install JDK 17
38+
uses: actions/setup-java@v5
39+
with:
40+
distribution: "zulu"
41+
java-version: "17"
42+
43+
- name: Setup Gradle
44+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
45+
46+
- name: Get current version
47+
id: version-file
48+
run: |
49+
version_from_file=$(head -n 1 VERSION)
50+
echo "release-version=$version_from_file" >> $GITHUB_OUTPUT
51+
52+
- name: Bump version
53+
id: bump-version
54+
uses: actions-ecosystem/action-bump-semver@34e334551143a5301f38c830e44a22273c6ff5c5 # v1.0.0
55+
with:
56+
current_version: ${{ steps.version-file.outputs.release-version }}
57+
level: ${{ github.event.inputs.bump-type || 'patch' }}
58+
59+
- name: Save bumped version to file
60+
run: |
61+
echo "${{ steps.bump-version.outputs.new_version }}" > VERSION
62+
63+
- name: Publish to Maven local (smoke test)
64+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=${{ steps.bump-version.outputs.new_version }}
65+
66+
- name: Create Pull Request
67+
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
68+
with:
69+
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
70+
commit-message: "chore: prepare release ${{ steps.bump-version.outputs.new_version }}"
71+
branch: release/${{ steps.bump-version.outputs.new_version }}
72+
title: "Prepare release ${{ steps.bump-version.outputs.new_version }}"
73+
base: main
74+
body: |
75+
Preparing for release ${{ steps.bump-version.outputs.new_version }}
76+
- Bumped version to ${{ steps.bump-version.outputs.new_version }}

‎.github/workflows/release-publish.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Release – Publish
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- VERSION
9+
10+
permissions:
11+
contents: write
12+
13+
jobs:
14+
setup-and-version:
15+
runs-on: ubuntu-latest
16+
outputs:
17+
final_version: ${{ steps.version-file.outputs.release-version }}
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v6
21+
22+
- name: Get current version
23+
id: version-file
24+
run: |
25+
version_from_file=$(head -n 1 VERSION)
26+
echo "release-version=$version_from_file" >> $GITHUB_OUTPUT
27+
28+
build-and-release:
29+
needs: setup-and-version
30+
runs-on: ubuntu-latest
31+
env:
32+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY }}
33+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_PASSWORD }}
34+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
35+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
36+
steps:
37+
- name: Checkout repository
38+
uses: actions/checkout@v6
39+
40+
- name: Install JDK 17
41+
uses: actions/setup-java@v5
42+
with:
43+
distribution: "zulu"
44+
java-version: "17"
45+
46+
- name: Setup Gradle
47+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
48+
49+
- name: Publish core to Maven local (required before kits can compile)
50+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=${{ needs.setup-and-version.outputs.final_version }}
51+
52+
- name: Publish core to Maven Central
53+
run: ./gradlew publishMavenPublicationToMavenCentralRepository -PVERSION=${{ needs.setup-and-version.outputs.final_version }}
54+
55+
- name: Publish kits to Maven Central
56+
run: ./gradlew publishMavenPublicationToMavenCentralRepository -PVERSION=${{ needs.setup-and-version.outputs.final_version }} -c settings-kits.gradle
57+
58+
- name: Create GitHub release
59+
uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1.20.0
60+
with:
61+
makeLatest: true
62+
tag: ${{ needs.setup-and-version.outputs.final_version }}
63+
body: |
64+
Release ${{ needs.setup-and-version.outputs.final_version }}

0 commit comments

Comments
 (0)