From 14650f4af462ee26e33c6314bc122923bb6abd58 Mon Sep 17 00:00:00 2001 From: Scott Antonac Date: Thu, 20 Oct 2022 13:44:54 +1100 Subject: [PATCH 1/7] EIT-2067: update docs dependencies --- docs/Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 7b01b259..9c735591 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -1,20 +1,20 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.5.1) + activesupport (6.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.23.5) + commonmarker (0.23.6) concurrent-ruby (1.1.10) dnsruby (1.61.9) simpleidn (~> 0.1) @@ -25,10 +25,10 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.8.1) - faraday (2.5.2) + faraday (2.6.0) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) + faraday-net_http (3.0.1) ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) @@ -83,7 +83,7 @@ GEM octokit (~> 4.0) public_suffix (>= 3.0, < 5.0) typhoeus (~> 1.3) - html-pipeline (2.14.2) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) @@ -211,8 +211,8 @@ GEM jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.16.2) - nokogiri (1.13.8) + minitest (5.16.3) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.25.1) @@ -222,7 +222,7 @@ GEM forwardable-extended (~> 2.6) public_suffix (4.0.7) racc (1.6.0) - rb-fsevent (0.11.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) @@ -251,7 +251,7 @@ GEM unf_ext unf_ext (0.0.8.2) unicode-display_width (1.8.0) - zeitwerk (2.6.0) + zeitwerk (2.6.1) PLATFORMS ruby From aaaaa45bcf326533d86532d344e38e41207a5290 Mon Sep 17 00:00:00 2001 From: Scott Antonac Date: Thu, 20 Oct 2022 13:50:57 +1100 Subject: [PATCH 2/7] EIT-2067: update actions in GH workflows - actions/setup-java: v1 -> v2 - required distribution to be set - actions/checkout: v2 -> v3 --- .github/workflows/build-and-test.yml | 14 ++++++++------ .github/workflows/release-snapshot.yml | 7 ++++--- .github/workflows/release.yml | 7 ++++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 72fbd336..3dd04860 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -12,12 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: '11' + java-version: 11 + distribution: 'zulu' - name: Lint run: ./gradlew afterpay:lintDebug afterpay:ktlint @@ -30,12 +31,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: '11' + java-version: 11 + distribution: 'zulu' - name: Build and Lint run: ./gradlew example:buildDebug example:lintDebug example:ktlint diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml index 447c0648..8a954d11 100644 --- a/.github/workflows/release-snapshot.yml +++ b/.github/workflows/release-snapshot.yml @@ -9,12 +9,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: '11' + java-version: 11 + distribution: 'zulu' - name: Clean repository before building SDK run: ./gradlew clean diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 330bea41..a9f59809 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,12 +9,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone Repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: '11' + java-version: 11 + distribution: 'zulu' - name: Remove SNAPSHOT from version run: sed -i 's/-SNAPSHOT//g' gradle.properties From a6decf7cc6ed517772323341a42b5eff2ae9690e Mon Sep 17 00:00:00 2001 From: Scott Antonac Date: Fri, 21 Oct 2022 08:35:54 +1100 Subject: [PATCH 3/7] EIT-2067: update ktlint and address new lint issues --- .idea/codeStyles/Project.xml | 9 ------- .../afterpay/android/CancellationStatus.kt | 2 +- .../android/internal/AfterpayCheckoutV2.kt | 2 +- .../android/internal/AfterpayDrawable.kt | 16 ++++++------ .../android/internal/AfterpayString.kt | 10 +++---- .../com/afterpay/android/internal/Brand.kt | 8 +++--- .../com/afterpay/android/internal/Locales.kt | 2 +- .../android/view/AfterpayPriceBreakdown.kt | 5 ++-- build.gradle | 2 +- .../example/afterpay/AfterpayCheckoutTest.kt | 2 +- .../com/example/afterpay/MainActivity.kt | 26 +++++++++---------- .../afterpay/{nav_graph.kt => NavGraph.kt} | 2 +- .../afterpay/checkout/CheckoutFragment.kt | 8 +++--- .../afterpay/receipt/ReceiptFragment.kt | 6 ++--- .../afterpay/shopping/ShoppingFragment.kt | 6 ++--- 15 files changed, 49 insertions(+), 57 deletions(-) rename example/src/main/kotlin/com/example/afterpay/{nav_graph.kt => NavGraph.kt} (96%) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 4e2fe53d..7829f3cf 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -6,15 +6,6 @@ -