Merge remote-tracking branch 'origin/master' into dev

2024-12-19 15:33:00 +03:00 · 2024-02-03 03:36:22 +01:00 · 2024-02-03 03:36:22 +01:00 · 0eba525d5f
commit 0eba525d5f
parent 84e6aa09e9 17c305c9fa
9 changed files with 104 additions and 24 deletions
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@ -19,4 +19,4 @@ jobs:
        runs-on: ubuntu-latest
        steps:
            - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-            - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
+            - uses: gradle/wrapper-validation-action@27152f6fa06a6b8062ef7195c795692e51fc2c81 # v2.0.0
--- a/.github/workflows/screenShotTest.yml
+++ b/.github/workflows/screenShotTest.yml
@ -47,7 +47,7 @@ jobs:

            -   name: create AVD and generate snapshot for caching
                if: steps.avd-cache.outputs.cache-hit != 'true'
-                uses: reactivecircus/android-emulator-runner@99a4aac18b4df9b3af66c4a1f04c1f23fa10c270 # v2.29.0
+                uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # v2.30.1
                with:
                    api-level: ${{ matrix.api-level }}
                    force-avd-creation: false
@ -73,7 +73,7 @@ jobs:
                run: scripts/deleteOldComments.sh "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}}

            -   name: Run screenshot tests
-                uses: reactivecircus/android-emulator-runner@99a4aac18b4df9b3af66c4a1f04c1f23fa10c270 # v2.29.0
+                uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # v2.30.1
                with:
                    api-level: ${{ matrix.api-level }}
                    force-avd-creation: false
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@ -30,7 +30,7 @@ jobs:
                if: ${{ always() }}
                run: scripts/deleteOldComments.sh "test" "Unit" ${{github.event.number}}
            -   name: Run unit tests with coverage
-                uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0
+                uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # v3.0.0
                with:
                    arguments: jacocoTestGplayDebugUnitTest
            -   name: Upload failing results
@ -39,7 +39,7 @@ jobs:
                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                run: scripts/uploadReport.sh "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" ${{github.event.number}} "test" "Unit" ${{github.event.number}}
            -   name: Upload coverage to codecov
-                uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
+                uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
                with:
                    token: ${{ secrets.CODECOV_TOKEN }}
                    flags: unit
--- a/app/build.gradle
+++ b/app/build.gradle
@ -8,7 +8,7 @@ buildscript {
        classpath "com.android.tools.build:gradle:$androidPluginVersion"
        classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.7'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.4"
+        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.5"
        classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
        classpath 'com.karumi:shot:5.14.1'
        classpath "org.jacoco:org.jacoco.core:$jacoco_version"
@ -333,7 +333,7 @@ dependencies {
    }

    if (perfAnalysis) {
-        debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
+        debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
    }

    // dependencies for local unit tests
@ -352,7 +352,7 @@ dependencies {
    androidTestImplementation "androidx.test:rules:$androidxTestVersion"
    // Android JUnit Runner
    androidTestImplementation "androidx.test:runner:$androidxTestVersion"
-    androidTestUtil "androidx.test:orchestrator:$androidxTestVersion"
+    androidTestUtil "androidx.test:orchestrator:1.4.2"
    androidTestImplementation "androidx.test:core-ktx:$androidxTestVersion"

    // Espresso
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -934,6 +934,7 @@
    <string name="uploads_view_upload_status_fetching_server_version">Sunucu sürümü alınıyor…</string>
    <string name="uploads_view_upload_status_service_interrupted">Uygulama sonlandırıldı</string>
    <string name="uploads_view_upload_status_succeeded">Tamamlandı</string>
+    <string name="uploads_view_upload_status_succeeded_same_file">Uzakta aynı dosya var olduğundan yüklenmedi</string>
    <string name="uploads_view_upload_status_unknown_fail">Bilinmeyen sorun</string>
    <string name="uploads_view_upload_status_virus_detected">Virus bulundu. Yükleme tamamlanamadı!</string>
    <string name="uploads_view_upload_status_waiting_exit_power_save_mode">Güç tasarrufu kipinden çıkılması bekleniyor</string>
--- a/build.gradle
+++ b/build.gradle
@ -4,11 +4,11 @@ buildscript {
        appCompatVersion = '1.6.1'
        jacoco_version = '0.8.11'
        kotlin_version = '1.8.22'
-        androidxTestVersion = "1.4.0"
+        androidxTestVersion = "1.5.0"
        daggerVersion = "2.50"
        markwonVersion = "4.6.2"
        prismVersion = "2.0.0"
-        androidLibraryVersion ="012db19c2be48c2dde25c1ee107ef4244d0314b6"
+        androidLibraryVersion = "008d82ae1c"
        mockitoVersion = "4.11.0"
        mockitoKotlinVersion = "4.1.0"
        mockkVersion = "1.13.9"
--- a/gradle/verification-keyring.keys
+++ b/gradle/verification-keyring.keys
@ -5497,6 +5497,51 @@ Zm7SPjIW+sWOab+FF35lQTVGS3U/EUoTCTsHpgSY1JMn
 =uDN6
 -----END PGP PUBLIC KEY BLOCK-----

+pub    3D002DBC5EA9615F
+uid    Drew Hamilton <drew.hamilton.0@gmail.com>
+
+sub    91FCCDE555C64A9F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+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
+=f38L
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub    3D12CA2AC19F3181
 uid    Tatu Saloranta (cowtowncoder) <tatu.saloranta@iki.fi>

--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@ -11,7 +11,6 @@
         <ignored-key id="3D12CA2AC19F3181" reason="Key couldn't be downloaded from any key server"/>
         <ignored-key id="991EFB94DB91127D" reason="Key couldn't be downloaded from any key server"/>
         <ignored-key id="F13D3E721D56BD54" reason="Key couldn't be downloaded from any key server"/>
-         <ignored-key id="3D002DBC5EA9615F" reason="Key couldn't be downloaded from any key server"/>
         <ignored-key id="4F91D100EB1F597B" reason="Key couldn't be downloaded from any key server"/>
      </ignored-keys>
      <trusted-keys>
@ -142,6 +141,7 @@
         <trusted-key id="6F538074CCEBF35F28AF9B066A0975F8B1127B83" group="org.jetbrains.kotlin"/>
         <trusted-key id="6F656B7F6BFB238D38ACF81F3C27D97B0C83A85C" group="com.google.errorprone"/>
         <trusted-key id="6F7E5ACBCD02DB60DFD232E45E1F79A7C298661E" group="com.google.auto"/>
+         <trusted-key id="720746177725A89207A7075BFD5DEA07FCB690A8" group="org.codehaus.mojo" name="mojo-parent" version="50"/>
         <trusted-key id="7488FE3E7E31E325FFDF6F1DA0E8A2E551EE7606" group="com.thoughtworks.paranamer"/>
         <trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs"/>
         <trusted-key id="796737EDB7CB2E2904E2BFA447B25FE8A3702A09" group="^org[.]jbundle($|([.].*))" regex="true"/>
@ -244,6 +244,7 @@
         <trusted-key id="E5C3B1929191DF06136CCB2B164779204E106A76" group="org.javassist" name="javassist" version="3.28.0-GA"/>
         <trusted-key id="E77417AC194160A3FABD04969A259C7EE636C5ED" group="^com[.]google($|([.].*))" regex="true"/>
         <trusted-key id="E7DC75FC24FB3C8DFE8086AD3D5839A2262CBBFB" group="org.jetbrains.kotlinx"/>
+         <trusted-key id="E82D2EAF2E83830CE1F7F6BE571A5291E827E1C7" group="net.java" name="jvnet-parent" version="3"/>
         <trusted-key id="E85AED155021AF8A6C6B7A4A7C7D8456294423BA" group="org.objenesis"/>
         <trusted-key id="EAA526B91DD83BA3E1B9636FA730529CA355A63E" group="org.ccil.cowan.tagsoup" name="tagsoup" version="1.2.1"/>
         <trusted-key id="EBB241A545CB17C87FACB2EBD0BF1D737C9A1C22" group="net.sourceforge.pmd"/>
@ -1892,6 +1893,14 @@
            <sha256 value="2b52b4cb49450b9bc0234436d30c95834a0c223264b0d11230ac0356efe416c9" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="androidx.test" name="core-ktx" version="1.5.0">
+         <artifact name="core-ktx-1.5.0.aar">
+            <sha256 value="f20f34e4bbb52d3085bd67ff3e1e10af7c428a33de5f556650b415346f1bfde2" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="core-ktx-1.5.0.pom">
+            <sha256 value="5f59afc55208b4efb9901f37323e710c66b4bb4304c0e167a24cdb3f9214a58e" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="androidx.test" name="monitor" version="1.3.0">
         <artifact name="monitor-1.3.0.aar">
            <sha256 value="f73a31306a783e63150c60c49e140dc38da39a1b7947690f4b73387b5ebad77e" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -1908,6 +1917,14 @@
            <sha256 value="d1f64233f29f0ede076b67e572a2842028a8838dbdab59193e2bfba4ddf26afe" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="androidx.test" name="monitor" version="1.6.0">
+         <artifact name="monitor-1.6.0.aar">
+            <sha256 value="05ed2e6ee93271d1d8ffe3f06739e5b621cbe37880b24adf4ce2f49ebd59fda3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="monitor-1.6.0.pom">
+            <sha256 value="e6e32c3c34a33e81a64fa79ddd06cd47484594e40aea400bbb370ba102bea238" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="androidx.test" name="monitor" version="1.6.1">
         <artifact name="monitor-1.6.1.aar">
            <sha256 value="2985ce8556989baf7c84342e7f687713c037a39a922e614d1a3ddf1ca3777079" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -1924,6 +1941,14 @@
            <sha256 value="bbfe60cab83b9412ebcdaab55afe50d6f3e017bcfba1cd0bf866d529790a3afe" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="androidx.test" name="orchestrator" version="1.4.2">
+         <artifact name="orchestrator-1.4.2.apk">
+            <sha256 value="b7a2e7d0184b03e12c7357f3914d539da40b52a11e90815edff1022c655f459b" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="orchestrator-1.4.2.pom">
+            <sha256 value="a7621cc2e0c949ae0630fd390ac70331c5f2a68ac0dc48e8d6af74e5cbd87989" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="androidx.test" name="rules" version="1.4.0">
         <artifact name="rules-1.4.0.pom">
            <sha256 value="01545f7b65d7e6255df4601257ac89854fedbe72e5df8ddd642c7de5fcdfc197" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -1950,6 +1975,11 @@
            <sha256 value="013b2a295b45a315a8efb1c308f0e185da39c58091a3778a44866c47e8cef4eb" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="androidx.test" name="runner" version="1.5.0">
+         <artifact name="runner-1.5.0.pom">
+            <sha256 value="909882bb86a8618f307d439ead4545cf74f54d3dc6088c232e1bab4f9a97f6cc" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="androidx.test" name="runner" version="1.5.2">
         <artifact name="runner-1.5.2.aar">
            <sha256 value="36cd6bc876daa1f183ccd11f9898e094c71f06960fde85a373422959613a44d6" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -2059,6 +2089,14 @@
            <sha256 value="a594e4b9fb9834bdca7c4cf39a1e354245e9e4084f22c782ccd6e6a02cda3a56" origin="Generated by Gradle" reason="Artifact is not signed"/>
         </artifact>
      </component>
+      <component group="androidx.test.services" name="test-services" version="1.4.2">
+         <artifact name="test-services-1.4.2.apk">
+            <sha256 value="c6bc74268b29bdabad8da962e00e2f6fd613c24b42c69e81b258397b4819f156" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="test-services-1.4.2.pom">
+            <sha256 value="c33a2ab686ab27b20ca7c3c3f4a4f81265efd2813ea4266eaa304332d384d4aa" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="androidx.test.uiautomator" name="uiautomator" version="2.2.0">
         <artifact name="uiautomator-2.2.0.aar">
            <sha256 value="2838e9d961dbffefbbd229a2bd4f6f82ac4fb2462975862a9e75e9ed325a3197" origin="Generated by Gradle" reason="Artifact is not signed"/>
@ -2973,6 +3011,14 @@
            <sha256 value="6a91a2139a3cae8126c509cf65d136d49c35cb032b581ac1a56cb6a649cc0245" origin="Generated by Gradle"/>
         </artifact>
      </component>
+      <component group="com.github.nextcloud" name="android-library" version="008d82ae1c">
+         <artifact name="android-library-008d82ae1c.aar">
+            <sha256 value="bdc44e874f1e14338213ae5723e71710940a31416ff1c52c9eb2f282e5d3f29a" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-008d82ae1c.module">
+            <sha256 value="f28a1132b6a425d00bca507cadc1520d8f6805893a99feec8eb2b3228416dea1" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
      <component group="com.github.nextcloud-deps" name="qrcodescanner" version="0.1.2.4">
         <artifact name="qrcodescanner-0.1.2.4.aar">
            <sha256 value="b286128792cc04f59b0defa2c937c86d9e2fc824a8011b9af9eea7fd0ea84303" origin="Generated by Gradle" reason="Artifact is not signed"/>
--- a/scripts/analysis/analysis-wrapper.sh
+++ b/scripts/analysis/analysis-wrapper.sh
@ -53,18 +53,6 @@ else
        curl_gh -X DELETE "https://api.github.com/repos/nextcloud/$repository/issues/comments/$comment"
    done

-    # check library, only if base branch is master
-    baseBranch=$(scripts/analysis/getBranchBase.sh "${PR_NUMBER}" | tr -d "\"")
-    if [ $baseBranch = "master" -a $(grep "androidLibraryVersion = \"master-SNAPSHOT\"" build.gradle -c) -ne 1 ]; then
-        checkLibraryMessage="<h1>Android-library is not set to master branch in build.gradle</h1>"
-        checkLibrary=1
-    elif [ $baseBranch != "master" -a $baseBranch = $stableBranch -a $(grep "androidLibraryVersion.*SNAPSHOT" build.gradle -c) -ne 0 ]; then
-        checkLibraryMessage="<h1>Android-library is set to a SNAPSHOT in build.gradle</h1>"
-        checkLibrary=1
-    else
-        checkLibrary=0
-    fi
-
    # lint and spotbugs file must exist
    if [ ! -s app/build/reports/lint/lint.html ] ; then
        echo "lint.html file is missing!"
@ -131,7 +119,7 @@ else
        notNull="org.jetbrains.annotations.* is used. Please use androidx.annotation.* instead.<br><br>"
    fi

-    bodyContent="$codacyResult $lintResult $spotbugsResult $checkLibraryMessage $lintMessage $spotbugsMessage $gplayLimitation $notNull"
+    bodyContent="$codacyResult $lintResult $spotbugsResult $lintMessage $spotbugsMessage $gplayLimitation $notNull"
    echo "$bodyContent" >> "$GITHUB_STEP_SUMMARY"
    payload="{ \"body\" : \"$bodyContent\" }"
    curl_gh -X POST "https://api.github.com/repos/nextcloud/$repository/issues/${PR_NUMBER}/comments" -d "$payload"