Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Version Catalog #277

Merged
merged 25 commits into from
Oct 23, 2024
Merged

Update to Version Catalog #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bbc428c
Create libs.versions.toml file and migrate kotlin stdlib.
sshropshire Oct 17, 2024
9ee590b
Migrate additional libraries to version catalog.
sshropshire Oct 17, 2024
1efaad1
Migrate appcompat dependency to version catalog.
sshropshire Oct 17, 2024
b31f0cd
Update version catalog to include androidx compose libraries.
sshropshire Oct 17, 2024
eec87e5
Migrate additional jetpack compose libraries to version catalog.
sshropshire Oct 17, 2024
dc08b58
Migrate jetpack preference lib to reference catalog.
sshropshire Oct 17, 2024
cac06f4
Migrate square dependencies to version catalog.
sshropshire Oct 17, 2024
d9b44ed
Migrate square libs to version catalog.
sshropshire Oct 17, 2024
8e75133
Migrate browser switch to version catalog.
sshropshire Oct 17, 2024
72a201b
Migrate test dependencies to version catalog.
sshropshire Oct 17, 2024
87c1989
Migrate native checkout dependencies to version catalog.
sshropshire Oct 17, 2024
4680a5c
Migrate some plugins over to version catalogs.
sshropshire Oct 18, 2024
11e471b
Migrate dagger hilt to version catalog.
sshropshire Oct 18, 2024
bf5ed7e
Migrate jacoco to version catalog.
sshropshire Oct 18, 2024
badb181
Remove build.gradle configuration that's no longer needed.
sshropshire Oct 18, 2024
111579f
Remove subprojects block.
sshropshire Oct 18, 2024
8a4e7e2
Migrate kotlin parcelize to version catalog.
sshropshire Oct 18, 2024
c05fd63
Migrate to alias.
sshropshire Oct 18, 2024
b16e024
Clean up version catalog unused dependencies.
sshropshire Oct 18, 2024
8649a27
Sort version dependencies in alphabetical order.
sshropshire Oct 18, 2024
273840a
Adjust verion catalog naming similar to ref: https://blog.gradle.org/…
sshropshire Oct 18, 2024
ba759da
Update naming of plugins.
sshropshire Oct 18, 2024
a23896c
Migrate GitHub actions to use non-deprecated versions.
sshropshire Oct 18, 2024
dce43cd
Upgrade remaining GitHub actions that are causing CI to fail.
sshropshire Oct 18, 2024
5eb4aa6
Update jsonAssert library naming.
sshropshire Oct 18, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
SIGNING_KEY_FILE_PATH: /home/runner/secretKey.gpg
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand Down
44 changes: 22 additions & 22 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -39,9 +39,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -55,9 +55,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -70,9 +70,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -85,9 +85,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -100,9 +100,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -126,9 +126,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set github user
uses: ./.github/actions/set_github_user
- name: Update Version
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release_demo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set github user
uses: ./.github/actions/set_github_user
- name: Update Version
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/release_snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -42,9 +42,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -58,9 +58,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -73,9 +73,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -88,9 +88,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -103,9 +103,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -129,9 +129,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/static_analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -23,9 +23,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand All @@ -37,21 +37,21 @@ jobs:
runs-on: macOS-13
steps:
# Set up environment to assemble SDK
- name: Set up Java 11
uses: actions/setup-java@v3
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'

# Assemble artifacts from main branch
- name: Checkout Main Branch
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: main
- name: Assemble Release AAR on Main Branch
run: ./gradlew clean assembleRelease -x :Demo:assembleRelease # we exclude Demo module in assemble
- name: Upload Main Branch Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: main-aar
path: |
Expand All @@ -64,11 +64,11 @@ jobs:

# Assemble artifacts from current branch
- name: Checkout Current Branch
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Assemble Release AAR on Current Branch
run: ./gradlew clean assembleRelease -x :Demo:assembleRelease # we exclude Demo module in assemble
- name: Upload Current Branch Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: current-aar
path: |
Expand All @@ -83,9 +83,9 @@ jobs:
- name: Install Diffuse
run: brew install JakeWharton/repo/diffuse
- name: Download Workflow Artifacts
uses: actions/download-artifact@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/download-artifact@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: 'microsoft'
java-version: '11'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up Java 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'microsoft'
Expand Down
3 changes: 2 additions & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading