From e7ceffd358aa5a4372c6803677a83429f4dec025 Mon Sep 17 00:00:00 2001 From: ligi Date: Wed, 14 Jun 2023 06:50:34 +0200 Subject: [PATCH 01/25] Make gradle build with new java versions (#483) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b281075e7..16d0a03e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ android.enableJetifier=true android.useAndroidX=true -org.gradle.jvmargs=-Xms128m -Xmx1024m -XX:+CMSClassUnloadingEnabled +org.gradle.jvmargs=-Xms128m -Xmx1024m \ No newline at end of file From 5e0e221f18a3ab245157ce4528ed41af0c893a96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Jun 2023 07:50:52 +0200 Subject: [PATCH 02/25] Bump kotlin_version from 1.8.21 to 1.8.22 (#481) Bumps `kotlin_version` from 1.8.21 to 1.8.22. Updates `org.jetbrains.kotlin:kotlin-gradle-plugin` from 1.8.21 to 1.8.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `org.jetbrains.kotlin:kotlin-stdlib` from 1.8.21 to 1.8.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ligi --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0ece63c38..11b39548c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - kotlin_version = '1.8.21' + kotlin_version = '1.8.22' // wait for upstream https://github.com/mockito/mockito/issues/2007 mockito_version = '3.4.6' threetenbp_version = '1.6.8' From a1bd4e649c22eee676f7fc72a9d2740685f71df9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Jun 2023 21:03:12 +0200 Subject: [PATCH 03/25] Bump io.insert-koin:koin-android from 3.4.0 to 3.4.2 (#478) Bumps [io.insert-koin:koin-android](https://github.com/InsertKoinIO/koin) from 3.4.0 to 3.4.2. - [Changelog](https://github.com/InsertKoinIO/koin/blob/main/CHANGELOG.md) - [Commits](https://github.com/InsertKoinIO/koin/compare/core-3.4.0...core-3.4.2) --- updated-dependencies: - dependency-name: io.insert-koin:koin-android dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 9b36d1a38..910717bae 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -120,7 +120,7 @@ android { dependencies { implementation 'com.github.permissions-dispatcher:permissionsdispatcher-ktx:4.8.0' - implementation "io.insert-koin:koin-android:3.4.0" + implementation "io.insert-koin:koin-android:3.4.2" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1" implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' From ce1c46b8aad8011940f626b67b250c690a6b8e22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Jun 2023 22:09:09 +0200 Subject: [PATCH 04/25] Bump com.squareup.leakcanary:leakcanary-android from 2.10 to 2.11 (#465) Bumps [com.squareup.leakcanary:leakcanary-android](https://github.com/square/leakcanary) from 2.10 to 2.11. - [Release notes](https://github.com/square/leakcanary/releases) - [Changelog](https://github.com/square/leakcanary/blob/main/docs/changelog.md) - [Commits](https://github.com/square/leakcanary/compare/v2.10...v2.11) --- updated-dependencies: - dependency-name: com.squareup.leakcanary:leakcanary-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 910717bae..bdc17c62d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -197,7 +197,7 @@ dependencies { //noinspection GradleDependency implementation 'com.google.zxing:core:3.3.0' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11' // requires minSDK 16 according to docs, not sure if it causes an issue withAnalyticsImplementation 'com.google.android.gms:play-services-analytics:18.0.2' From f661af6bd733f30c43cf712e69e28efced12f358 Mon Sep 17 00:00:00 2001 From: ligi Date: Sat, 15 Jul 2023 04:32:22 +0200 Subject: [PATCH 05/25] Use versions plugin 0.47.0 (#488) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 11b39548c..3756fa552 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.trevjonez.composer:plugin:1.0.0-rc08' - classpath 'com.github.ben-manes:gradle-versions-plugin:0.46.0' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.47.0' classpath 'com.github.bjoernq:unmockplugin:0.7.9' } } From ef0606de249ed9ac80ec873a15e078965d955f31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jul 2023 05:52:55 +0200 Subject: [PATCH 06/25] Bump androidx.webkit:webkit from 1.6.1 to 1.7.0 (#467) Bumps androidx.webkit:webkit from 1.6.1 to 1.7.0. --- updated-dependencies: - dependency-name: androidx.webkit:webkit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ligi --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index bdc17c62d..d48b293bc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -157,7 +157,7 @@ dependencies { implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.fragment:fragment-ktx:1.5.7' - implementation 'androidx.webkit:webkit:1.6.1' + implementation 'androidx.webkit:webkit:1.7.0' implementation 'com.google.android.material:material:1.9.0' implementation 'net.i2p.android.ext:floatingactionbutton:1.10.1' From 6511e86935312d3943d965544d25ec60f4c0b1bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Jul 2023 06:16:06 +0200 Subject: [PATCH 07/25] Bump org.jetbrains.kotlinx:kotlinx-coroutines-android (#487) Bumps [org.jetbrains.kotlinx:kotlinx-coroutines-android](https://github.com/Kotlin/kotlinx.coroutines) from 1.7.1 to 1.7.2. - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.7.1...1.7.2) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ligi --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index d48b293bc..eebddb685 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -122,7 +122,7 @@ dependencies { implementation "io.insert-koin:koin-android:3.4.2" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.2" implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1' From c5ef564a968a3b1e70bcfed4ba7a1395032f35ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 22:58:11 +0200 Subject: [PATCH 08/25] Bump androidx.fragment:fragment-ktx from 1.5.7 to 1.6.0 (#482) Bumps androidx.fragment:fragment-ktx from 1.5.7 to 1.6.0. --- updated-dependencies: - dependency-name: androidx.fragment:fragment-ktx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ligi --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index eebddb685..e58b9fc1c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -156,7 +156,7 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.core:core-ktx:1.10.1' - implementation 'androidx.fragment:fragment-ktx:1.5.7' + implementation 'androidx.fragment:fragment-ktx:1.6.0' implementation 'androidx.webkit:webkit:1.7.0' implementation 'com.google.android.material:material:1.9.0' implementation 'net.i2p.android.ext:floatingactionbutton:1.10.1' From 53b3af09792c933def7c98aca2934e04ad96464f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Magaz=20Gra=C3=A7a?= Date: Sat, 2 Sep 2023 15:05:10 +0200 Subject: [PATCH 09/25] Allow the use to copy any text in a pass (#476) The user may need to copy text from the pass for many reasons. For example, to connect to the WiFi from Renfe trains company in Spain they ask you for the train ticket number. Being able to just copy and paste it into the form makes it much easier. Co-authored-by: ligi --- android/src/main/res/layout/barcode.xml | 3 ++- android/src/main/res/layout/pkpass_view_extra_data.xml | 1 + android/src/main/res/layout/vertical_field_item.xml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/android/src/main/res/layout/barcode.xml b/android/src/main/res/layout/barcode.xml index 9ca90e707..7c5b35666 100644 --- a/android/src/main/res/layout/barcode.xml +++ b/android/src/main/res/layout/barcode.xml @@ -55,5 +55,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:paddingBottom="8dp" /> + android:paddingBottom="8dp" + android:textIsSelectable="true" /> \ No newline at end of file diff --git a/android/src/main/res/layout/pkpass_view_extra_data.xml b/android/src/main/res/layout/pkpass_view_extra_data.xml index 4e0a0a35f..74b0b3955 100644 --- a/android/src/main/res/layout/pkpass_view_extra_data.xml +++ b/android/src/main/res/layout/pkpass_view_extra_data.xml @@ -93,6 +93,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="sans-serif" + android:textIsSelectable="true" android:padding="24dp" android:visibility="gone"/> diff --git a/android/src/main/res/layout/vertical_field_item.xml b/android/src/main/res/layout/vertical_field_item.xml index c4dfd5737..d054facc1 100644 --- a/android/src/main/res/layout/vertical_field_item.xml +++ b/android/src/main/res/layout/vertical_field_item.xml @@ -12,6 +12,7 @@ android:layout_height="wrap_content" android:gravity="center" android:fontFamily="sans-serif-light" + android:textIsSelectable="true" android:textSize="14sp" tools:text="Key" android:id="@+id/key" /> @@ -21,6 +22,7 @@ android:layout_height="wrap_content" android:gravity="center" android:fontFamily="sans-serif" + android:textIsSelectable="true" android:textSize="18sp" tools:text="Value" android:id="@+id/value" /> From d4d8182eb64c97bff66f21e361fbba6474fa8f07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Sep 2023 17:47:44 +0200 Subject: [PATCH 10/25] Bump com.squareup.leakcanary:leakcanary-android from 2.11 to 2.12 (#490) Bumps [com.squareup.leakcanary:leakcanary-android](https://github.com/square/leakcanary) from 2.11 to 2.12. - [Release notes](https://github.com/square/leakcanary/releases) - [Changelog](https://github.com/square/leakcanary/blob/main/docs/changelog.md) - [Commits](https://github.com/square/leakcanary/compare/v2.11...v2.12) --- updated-dependencies: - dependency-name: com.squareup.leakcanary:leakcanary-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ligi --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index e58b9fc1c..449d19283 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -197,7 +197,7 @@ dependencies { //noinspection GradleDependency implementation 'com.google.zxing:core:3.3.0' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12' // requires minSDK 16 according to docs, not sure if it causes an issue withAnalyticsImplementation 'com.google.android.gms:play-services-analytics:18.0.2' From 8f5b30f5a409dc9505196711d6134811eeab9efb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 21:21:56 +0200 Subject: [PATCH 11/25] Bump androidx.preference:preference-ktx from 1.2.0 to 1.2.1 (#501) Bumps androidx.preference:preference-ktx from 1.2.0 to 1.2.1. --- updated-dependencies: - dependency-name: androidx.preference:preference-ktx dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 449d19283..3378ffb18 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -151,7 +151,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.preference:preference-ktx:1.2.0' + implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.annotation:annotation:1.6.0' implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.cardview:cardview:1.0.0' From c92fcd2f322fb066e97aef355e3220cbe28f5804 Mon Sep 17 00:00:00 2001 From: ligi Date: Thu, 26 Sep 2024 23:53:41 +0200 Subject: [PATCH 12/25] Add github actions to lint and test (#528) * Increase heap-space - just got OOM * Add github actions to lint and test --- .github/workflows/lint.yml | 21 ++++++++++++++++++ .github/workflows/test.yml | 45 ++++++++++++++++++++++++++++++++++++++ gradle.properties | 2 +- 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/lint.yml create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 000000000..5a314cbf0 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,21 @@ +name: Linting + +on: + push: + pull_request: + +jobs: + analyse: + name: Analyse + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: '17' + + - run: ./gradlew lint diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..a2e20ecd9 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,45 @@ +#https://github.com/marketplace/actions/android-emulator-runner +name: Test +on: + push: + pull_request: + workflow_dispatch: + +jobs: + test: + timeout-minutes: 45 + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4 + + - uses: actions/setup-java@v4 + with: + distribution: 'adopt' + java-version: '17' + + - name: Enable KVM group perms + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm + + - uses: gradle/actions/setup-gradle@v3 + + - name: run tests + uses: reactivecircus/android-emulator-runner@v2 + with: + arch: x86_64 + api-level: 34 + script: ./gradlew connectedWithMapsWithAnalyticsForPlayDebugAndroidTest + env: + API_LEVEL: 34 + + - name: Archive + if: always() + uses: actions/upload-artifact@v4 + with: + name: code-coverage-report + path: build/reports/androidTests/ + retention-days: 7 + diff --git a/gradle.properties b/gradle.properties index 16d0a03e8..1fa4035f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ android.enableJetifier=true android.useAndroidX=true -org.gradle.jvmargs=-Xms128m -Xmx1024m \ No newline at end of file +org.gradle.jvmargs=-Xms128m -Xmx2048m \ No newline at end of file From 7c0be97d1174a6d78e57a7f7a6a9cf0558c8bad5 Mon Sep 17 00:00:00 2001 From: hillcaustic <157627447+hillcaustic@users.noreply.github.com> Date: Fri, 25 Oct 2024 20:39:15 +0200 Subject: [PATCH 13/25] =?UTF-8?q?Updated=20a=20few=20things=20so=20that=20?= =?UTF-8?q?the=20app=20works=20under=20current=20android=20arch=E2=80=A6?= =?UTF-8?q?=20(#527)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated a few things so that the app works under current android architecture * Add lint baseline * Update android/src/main/java/org/ligi/passandroid/ui/PassListActivity.kt * Update android/src/main/java/org/ligi/passandroid/ui/PreferenceActivity.kt --------- Co-authored-by: gaurav Co-authored-by: ligi --- android/build.gradle | 14 +- android/lint-baseline.xml | 5043 +++++++++++++++++ android/src/debug/AndroidManifest.xml | 3 +- .../ligi/passandroid/ui/PassListActivity.kt | 4 + .../ligi/passandroid/ui/PassViewActivity.kt | 2 +- .../ligi/passandroid/ui/PreferenceActivity.kt | 10 + .../org/ligi/passandroid/ui/PrefsFragment.kt | 6 +- android/src/main/res/layout/activity_help.xml | 1 + .../res/layout/activity_pass_view_base.xml | 6 + android/src/main/res/layout/pass_list.xml | 1 + android/src/withMaps/AndroidManifest.xml | 3 +- build.gradle | 2 +- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.properties | 2 +- 14 files changed, 5082 insertions(+), 17 deletions(-) create mode 100644 android/lint-baseline.xml diff --git a/android/build.gradle b/android/build.gradle index 3378ffb18..975c03040 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'kotlin-kapt' apply plugin: 'de.mobilej.unmock' repositories { - jcenter() mavenCentral() google() maven { url 'https://www.jitpack.io' } @@ -13,12 +12,12 @@ repositories { android { - compileSdkVersion 33 + compileSdkVersion 35 defaultConfig { versionCode 373 versionName "3.7.3" - minSdkVersion 14 + minSdkVersion 23 targetSdkVersion 33 applicationId "org.ligi.passandroid" namespace "org.ligi.passandroid" @@ -90,6 +89,7 @@ android { warning 'MissingTranslation' warning 'InvalidPackage' disable "NullSafeMutableLiveData" + baseline file("lint-baseline.xml") } buildTypes { @@ -106,15 +106,17 @@ android { buildFeatures { viewBinding true + buildConfig true } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } + namespace 'org.ligi.passandroid' } dependencies { diff --git a/android/lint-baseline.xml b/android/lint-baseline.xml new file mode 100644 index 000000000..2aa688377 --- /dev/null +++ b/android/lint-baseline.xml @@ -0,0 +1,5043 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/src/debug/AndroidManifest.xml b/android/src/debug/AndroidManifest.xml index 7da48e7e9..3280118c3 100644 --- a/android/src/debug/AndroidManifest.xml +++ b/android/src/debug/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/android/src/main/java/org/ligi/passandroid/ui/PassListActivity.kt b/android/src/main/java/org/ligi/passandroid/ui/PassListActivity.kt index 2ca88a392..64ef7bcca 100644 --- a/android/src/main/java/org/ligi/passandroid/ui/PassListActivity.kt +++ b/android/src/main/java/org/ligi/passandroid/ui/PassListActivity.kt @@ -12,9 +12,13 @@ import android.view.Menu import android.view.MenuItem import android.view.View.GONE import android.view.View.VISIBLE +import android.view.ViewGroup import androidx.appcompat.app.ActionBarDrawerToggle import androidx.appcompat.app.AlertDialog import androidx.core.view.GravityCompat +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.updateLayoutParams import androidx.lifecycle.lifecycleScope import androidx.viewpager.widget.ViewPager import com.google.android.material.snackbar.Snackbar diff --git a/android/src/main/java/org/ligi/passandroid/ui/PassViewActivity.kt b/android/src/main/java/org/ligi/passandroid/ui/PassViewActivity.kt index cfa2cb0e5..36d18be5f 100644 --- a/android/src/main/java/org/ligi/passandroid/ui/PassViewActivity.kt +++ b/android/src/main/java/org/ligi/passandroid/ui/PassViewActivity.kt @@ -34,7 +34,7 @@ class PassViewActivity : PassViewActivityBase() { } disableRotation() - setContentView(R.layout.activity_pass_view) + setContentView(R.layout.activity_pass_view_base) pagerAdapter = CollectionPagerAdapter(this, PassStoreProjection(passStore, passStore.classifier.getTopic(currentPass, ""), diff --git a/android/src/main/java/org/ligi/passandroid/ui/PreferenceActivity.kt b/android/src/main/java/org/ligi/passandroid/ui/PreferenceActivity.kt index a6fd059fd..d3adb20e9 100644 --- a/android/src/main/java/org/ligi/passandroid/ui/PreferenceActivity.kt +++ b/android/src/main/java/org/ligi/passandroid/ui/PreferenceActivity.kt @@ -1,9 +1,17 @@ package org.ligi.passandroid.ui import android.annotation.SuppressLint +import android.content.Context import android.os.Bundle +import android.util.AttributeSet +import android.view.LayoutInflater import androidx.appcompat.app.AppCompatActivity import android.view.MenuItem +import android.view.View +import android.view.ViewGroup +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.updateLayoutParams import org.ligi.passandroid.R class PreferenceActivity : AppCompatActivity() { @@ -27,3 +35,5 @@ class PreferenceActivity : AppCompatActivity() { } } + + diff --git a/android/src/main/java/org/ligi/passandroid/ui/PrefsFragment.kt b/android/src/main/java/org/ligi/passandroid/ui/PrefsFragment.kt index 8faefdae2..51844d04d 100644 --- a/android/src/main/java/org/ligi/passandroid/ui/PrefsFragment.kt +++ b/android/src/main/java/org/ligi/passandroid/ui/PrefsFragment.kt @@ -1,16 +1,13 @@ package org.ligi.passandroid.ui -import android.Manifest import android.content.SharedPreferences import android.os.Bundle import androidx.appcompat.app.AppCompatDelegate -import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO import androidx.core.app.ActivityCompat import androidx.preference.PreferenceFragmentCompat import org.koin.android.ext.android.inject import org.ligi.passandroid.R import org.ligi.passandroid.model.Settings -import permissions.dispatcher.ktx.constructPermissionsRequest class PrefsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedPreferenceChangeListener { @@ -26,7 +23,7 @@ class PrefsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedPref preferenceScreen.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this) } - override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) { + override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { if (key == getString(R.string.preference_key_nightmode)) { @AppCompatDelegate.NightMode val nightMode = settings.getNightMode() @@ -40,4 +37,5 @@ class PrefsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedPref setPreferencesFromResource(R.xml.preferences, rootKey) } + } diff --git a/android/src/main/res/layout/activity_help.xml b/android/src/main/res/layout/activity_help.xml index 01f1839ae..96bd7842b 100644 --- a/android/src/main/res/layout/activity_help.xml +++ b/android/src/main/res/layout/activity_help.xml @@ -8,6 +8,7 @@ diff --git a/android/src/main/res/layout/activity_pass_view_base.xml b/android/src/main/res/layout/activity_pass_view_base.xml index 667aedbac..d689487b2 100644 --- a/android/src/main/res/layout/activity_pass_view_base.xml +++ b/android/src/main/res/layout/activity_pass_view_base.xml @@ -1,4 +1,8 @@ + @@ -29,3 +34,4 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + diff --git a/android/src/main/res/layout/pass_list.xml b/android/src/main/res/layout/pass_list.xml index 1c7fb1224..37d95052a 100644 --- a/android/src/main/res/layout/pass_list.xml +++ b/android/src/main/res/layout/pass_list.xml @@ -14,6 +14,7 @@ diff --git a/android/src/withMaps/AndroidManifest.xml b/android/src/withMaps/AndroidManifest.xml index 80489319e..ee6fe730b 100644 --- a/android/src/withMaps/AndroidManifest.xml +++ b/android/src/withMaps/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/build.gradle b/build.gradle index 3756fa552..60eb6ec94 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.5.2' classpath 'com.trevjonez.composer:plugin:1.0.0-rc08' classpath 'com.github.ben-manes:gradle-versions-plugin:0.47.0' classpath 'com.github.bjoernq:unmockplugin:0.7.9' diff --git a/gradle.properties b/gradle.properties index 1fa4035f4..bb8369bfe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,5 @@ android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=-Xms128m -Xmx2048m \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e8be595e3..bb6c19194 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From cf8d654ef606158333b2479af4df0737d17069c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:07:45 +0200 Subject: [PATCH 14/25] Bump com.googlecode.objectify:objectify from 6.0.7 to 6.1.0 (#514) Bumps [com.googlecode.objectify:objectify](https://github.com/objectify/objectify) from 6.0.7 to 6.1.0. - [Commits](https://github.com/objectify/objectify/compare/6.0.7...6.1.0) --- updated-dependencies: - dependency-name: com.googlecode.objectify:objectify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ligi --- backend/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/build.gradle b/backend/build.gradle index 1c1154134..fcbaefaae 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -22,6 +22,6 @@ dependencies { implementation 'com.google.appengine:appengine-endpoints:1.9.86' implementation 'com.google.appengine:appengine-endpoints-deps:1.9.83' implementation 'javax.servlet:javax.servlet-api:4.0.1' - implementation 'com.googlecode.objectify:objectify:6.0.7' + implementation 'com.googlecode.objectify:objectify:6.1.0' implementation 'com.ganyo:gcm-server:1.1.0' } From 40db4ac0dee7d4ae5a7d41adda20a414fedccbe1 Mon Sep 17 00:00:00 2001 From: ligi Date: Sat, 26 Oct 2024 00:10:02 +0200 Subject: [PATCH 15/25] Only test and lint on PR (#533) --- .github/workflows/lint.yml | 1 - .github/workflows/test.yml | 2 -- 2 files changed, 3 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5a314cbf0..e7f4b7717 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,6 @@ name: Linting on: - push: pull_request: jobs: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a2e20ecd9..5ef567ec5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,9 +1,7 @@ #https://github.com/marketplace/actions/android-emulator-runner name: Test on: - push: pull_request: - workflow_dispatch: jobs: test: From a17b75c791cf470c28299152ef2c5db25e202c34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Oct 2024 00:55:02 +0200 Subject: [PATCH 16/25] Bump com.squareup.okio:okio from 3.3.0 to 3.6.0 (#505) Bumps [com.squareup.okio:okio](https://github.com/square/okio) from 3.3.0 to 3.6.0. - [Changelog](https://github.com/square/okio/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/okio/compare/parent-3.3.0...parent-3.6.0) --- updated-dependencies: - dependency-name: com.squareup.okio:okio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ligi --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 975c03040..8b78b0483 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -182,7 +182,7 @@ dependencies { implementation 'com.larswerkman:HoloColorPicker:1.5' implementation 'com.google.code.findbugs:jsr305:3.0.2' - implementation 'com.squareup.okio:okio:3.3.0' + implementation 'com.squareup.okio:okio:3.6.0' implementation 'com.squareup.moshi:moshi:1.15.0' kapt "com.squareup.moshi:moshi-kotlin-codegen:1.15.0" From 058572047b28bea5c3cd6b569b9c02f6c6c1ac20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Oct 2024 02:32:19 +0200 Subject: [PATCH 17/25] Bump kotlin_version from 1.8.22 to 1.9.0 (#489) Bumps `kotlin_version` from 1.8.22 to 1.9.0. Updates `org.jetbrains.kotlin:kotlin-gradle-plugin` from 1.8.22 to 1.9.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.22...v1.9.0) Updates `org.jetbrains.kotlin:kotlin-stdlib` from 1.8.22 to 1.9.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.22...v1.9.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ligi --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 60eb6ec94..184cb974c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - kotlin_version = '1.8.22' + kotlin_version = '1.9.0' // wait for upstream https://github.com/mockito/mockito/issues/2007 mockito_version = '3.4.6' threetenbp_version = '1.6.8' From 1cda1c988dce513029b14858ec86ae46ddf41a01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 13:02:37 +0100 Subject: [PATCH 18/25] Bump com.squareup.leakcanary:leakcanary-android from 2.12 to 2.14 (#535) Bumps [com.squareup.leakcanary:leakcanary-android](https://github.com/square/leakcanary) from 2.12 to 2.14. - [Release notes](https://github.com/square/leakcanary/releases) - [Changelog](https://github.com/square/leakcanary/blob/main/docs/changelog.md) - [Commits](https://github.com/square/leakcanary/compare/v2.12...v2.14) --- updated-dependencies: - dependency-name: com.squareup.leakcanary:leakcanary-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 8b78b0483..3ef4623ab 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -199,7 +199,7 @@ dependencies { //noinspection GradleDependency implementation 'com.google.zxing:core:3.3.0' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14' // requires minSDK 16 according to docs, not sure if it causes an issue withAnalyticsImplementation 'com.google.android.gms:play-services-analytics:18.0.2' From a6d006e8c7b05e16ba3417cef195269ce86605af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 13:26:42 +0100 Subject: [PATCH 19/25] Bump androidx.appcompat:appcompat from 1.6.1 to 1.7.0 (#536) Bumps androidx.appcompat:appcompat from 1.6.1 to 1.7.0. --- updated-dependencies: - dependency-name: androidx.appcompat:appcompat dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ligi --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 3ef4623ab..99afd293c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -152,7 +152,7 @@ dependencies { implementation 'com.jakewharton.threetenabp:threetenabp:1.4.6' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.annotation:annotation:1.6.0' implementation 'androidx.recyclerview:recyclerview:1.3.0' From bccad619fd87cffcfb7513a83248dd8f8c4d6b02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:16:45 +0700 Subject: [PATCH 20/25] Bump com.google.cloud.tools:appengine-gradle-plugin from 2.4.5 to 2.8.1 (#541) Bumps [com.google.cloud.tools:appengine-gradle-plugin](https://github.com/GoogleCloudPlatform/appengine-plugins) from 2.4.5 to 2.8.1. - [Release notes](https://github.com/GoogleCloudPlatform/appengine-plugins/releases) - [Changelog](https://github.com/GoogleCloudPlatform/appengine-plugins/blob/main/CHANGELOG.md) - [Commits](https://github.com/GoogleCloudPlatform/appengine-plugins/commits/v2.8.1) --- updated-dependencies: - dependency-name: com.google.cloud.tools:appengine-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- backend/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/build.gradle b/backend/build.gradle index fcbaefaae..6d7814cec 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.4.5' + classpath 'com.google.cloud.tools:appengine-gradle-plugin:2.8.1' } } From f67c20ca146f5ee2fd354fa5f21fd23111446375 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Nov 2024 20:50:23 +0700 Subject: [PATCH 21/25] Bump androidx.annotation:annotation from 1.6.0 to 1.9.1 (#543) Bumps androidx.annotation:annotation from 1.6.0 to 1.9.1. --- updated-dependencies: - dependency-name: androidx.annotation:annotation dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 99afd293c..91c298a75 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -154,7 +154,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.preference:preference-ktx:1.2.1' - implementation 'androidx.annotation:annotation:1.6.0' + implementation 'androidx.annotation:annotation:1.9.1' implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.core:core-ktx:1.10.1' From 383648237dacd193f2d7b45523bd5e934b1632d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:17:26 +0700 Subject: [PATCH 22/25] Bump com.linkedin.dexmaker:dexmaker-mockito from 2.28.3 to 2.28.4 (#542) Bumps [com.linkedin.dexmaker:dexmaker-mockito](https://github.com/linkedin/dexmaker) from 2.28.3 to 2.28.4. - [Release notes](https://github.com/linkedin/dexmaker/releases) - [Changelog](https://github.com/linkedin/dexmaker/blob/main/CHANGELOG.md) - [Commits](https://github.com/linkedin/dexmaker/compare/2.28.3...2.28.4) --- updated-dependencies: - dependency-name: com.linkedin.dexmaker:dexmaker-mockito dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ligi --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 91c298a75..d80004e9f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -140,7 +140,7 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1' androidTestImplementation 'com.squareup.assertj:assertj-android:1.2.0' androidTestImplementation "org.mockito:mockito-core:$mockito_version" - androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.3' + androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.4' androidTestImplementation 'com.google.code.findbugs:jsr305:3.0.2' androidTestImplementation "org.threeten:threetenbp:$threetenbp_version" androidTestImplementation 'com.android.support:multidex:1.0.3' From d7993b106670ca1674f7d182184959b837569c00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:30:03 +0700 Subject: [PATCH 23/25] Bump com.googlecode.objectify:objectify from 6.1.0 to 6.1.2 (#545) Bumps [com.googlecode.objectify:objectify](https://github.com/objectify/objectify) from 6.1.0 to 6.1.2. - [Commits](https://github.com/objectify/objectify/compare/6.1.0...6.1.2) --- updated-dependencies: - dependency-name: com.googlecode.objectify:objectify dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ligi --- backend/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/build.gradle b/backend/build.gradle index 6d7814cec..4e99bb16b 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -22,6 +22,6 @@ dependencies { implementation 'com.google.appengine:appengine-endpoints:1.9.86' implementation 'com.google.appengine:appengine-endpoints-deps:1.9.83' implementation 'javax.servlet:javax.servlet-api:4.0.1' - implementation 'com.googlecode.objectify:objectify:6.1.0' + implementation 'com.googlecode.objectify:objectify:6.1.2' implementation 'com.ganyo:gcm-server:1.1.0' } From 0f5e5e9ff87ed0366259437080f58adb75d22832 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 19:11:22 +0700 Subject: [PATCH 24/25] Bump androidx.webkit:webkit from 1.7.0 to 1.12.1 (#546) Bumps androidx.webkit:webkit from 1.7.0 to 1.12.1. --- updated-dependencies: - dependency-name: androidx.webkit:webkit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index d80004e9f..a7810c5a8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -159,7 +159,7 @@ dependencies { implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.fragment:fragment-ktx:1.6.0' - implementation 'androidx.webkit:webkit:1.7.0' + implementation 'androidx.webkit:webkit:1.12.1' implementation 'com.google.android.material:material:1.9.0' implementation 'net.i2p.android.ext:floatingactionbutton:1.10.1' From af2fab853349c9eb732a5920426daeb3a84e41e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:23:45 +0700 Subject: [PATCH 25/25] Bump androidx.test.espresso:espresso-contrib from 3.5.1 to 3.6.1 (#548) Bumps androidx.test.espresso:espresso-contrib from 3.5.1 to 3.6.1. --- updated-dependencies: - dependency-name: androidx.test.espresso:espresso-contrib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index a7810c5a8..09c1a1fbf 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -136,7 +136,7 @@ dependencies { androidTestImplementation 'androidx.test:core:1.5.0' androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1' + androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.6.1' androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1' androidTestImplementation 'com.squareup.assertj:assertj-android:1.2.0' androidTestImplementation "org.mockito:mockito-core:$mockito_version"