From cc942324356b06fe0c9a4b3f7329580681f1de61 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Tue, 10 Nov 2026 09:15:07 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/wo?= =?UTF-8?q?rkflows/'=20with=20remote=20'config/workflows/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nextcloud-android-bot --- .github/workflows/analysis.yml | 2 ++ .github/workflows/codeql.yml | 2 ++ .github/workflows/qa.yml | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 067a8a663cd0..09c03f1e644d 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -61,6 +61,8 @@ jobs: with: distribution: "temurin" java-version: 25 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1 - name: Install dependencies run: | sudo apt install python3-defusedxml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e5823fedc271..a7160281b7cb 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,6 +57,8 @@ jobs: with: distribution: "temurin" java-version: 25 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1 - name: Assemble run: | mkdir -p "$HOME/.gradle" diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index e6b5696cda99..9d3e465ace6b 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -37,6 +37,10 @@ jobs: distribution: "temurin" java-version: 25 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1 + if: ${{ steps.check-secrets.outputs.ok == 'true' }} + - name: Build QA id: build-qa if: ${{ steps.check-secrets.outputs.ok == 'true' }} From 03f76fd659f9782530b395bdd870bc69083863fe Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Tue, 10 Nov 2026 09:15:07 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'fastlane/'?= =?UTF-8?q?=20with=20remote=20'config/fastlane/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nextcloud-android-bot --- fastlane/common.Fastfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fastlane/common.Fastfile b/fastlane/common.Fastfile index 587310c03408..1c8a35c1803c 100644 --- a/fastlane/common.Fastfile +++ b/fastlane/common.Fastfile @@ -171,8 +171,8 @@ platform :android do private_lane :writeVersions do |options| File.open("../app/build.gradle.kts","r+") do |file| text = file.read - text.gsub!(/versionName = "(.*)"$/, "versionName = \"#{options[:versionName]}\"") - text.gsub!(/versionCode = ([0-9]*)$/, "versionCode = #{options[:versionCode]}") + text.sub!(/versionName = "(.*)"$/, "versionName = \"#{options[:versionName]}\"") + text.sub!(/versionCode = ([0-9]*)$/, "versionCode = #{options[:versionCode]}") file.rewind file.write(text) file.truncate(file.pos) @@ -275,7 +275,7 @@ platform :android do flavor: options[:flavor], build_type: 'Release', print_command: false, - properties: GRADLE_SIGNING_PROPERTIES + properties: defined?(APK_SIGNING_PROPERTIES) ? APK_SIGNING_PROPERTIES : GRADLE_SIGNING_PROPERTIES ) sh("mv ../app/build/outputs/apk/#{options[:flavor]}/release/*.apk ../release/nextcloud-#{APP}-#{options[:flavor]}-#{options[:versionCode]}.apk") @@ -340,8 +340,8 @@ platform :android do name: options[:name], is_prerelease: options[:isPrerelease], tag_name: options[:tag], - description: (File.read("metadata/android/en-US/changelogs/" + options[:versionCode] + ".txt") rescue "No changelog provided"), - upload_assets: Dir.glob("release/*.apk") + description: (File.read("metadata/android/en-US/changelogs/#{options[:versionCode]}.txt") rescue "No changelog provided"), + upload_assets: Dir.glob(File.expand_path("../release/*.apk")) ) end From 672dfc16d0a54941d1959feb65872d2628ceaac3 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Tue, 10 Nov 2026 09:15:07 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.'=20with?= =?UTF-8?q?=20remote=20'config/root/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nextcloud-android-bot --- Gemfile | 2 +- Gemfile.lock | 95 ++++++++++++++++++++++++++++------------------------ 2 files changed, 52 insertions(+), 45 deletions(-) diff --git a/Gemfile b/Gemfile index 1642e64e8898..906ddc55a1e3 100644 --- a/Gemfile +++ b/Gemfile @@ -3,5 +3,5 @@ source "https://rubygems.org" gem "fastlane" gem "abbrev" -plugins_path = File.join(File.dirname(__FILE__), '.', 'Pluginfile') +plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/Gemfile.lock b/Gemfile.lock index 0584204f5879..fc9c0423ffbd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,14 +3,14 @@ GEM specs: CFPropertyList (3.0.8) abbrev (0.1.2) - addressable (2.9.0) + addressable (2.9.2) public_suffix (>= 2.0.2, < 8.0) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.4.0) - aws-partitions (1.1290.0) - aws-sdk-core (3.257.0) - aws-eventstream (~> 1, >= 1.3.0) + aws-eventstream (1.4.1) + aws-partitions (1.1301.0) + aws-sdk-core (3.264.0) + aws-eventstream (~> 1, >= 1.4.1) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 @@ -18,11 +18,11 @@ GEM jmespath (~> 1, >= 1.6.1) logger rexml (~> 3.4, >= 3.4.2) - aws-sdk-kms (1.132.0) - aws-sdk-core (~> 3, >= 3.256.0) + aws-sdk-kms (1.139.0) + aws-sdk-core (~> 3, >= 3.264.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.232.2) - aws-sdk-core (~> 3, >= 3.256.0) + aws-sdk-s3 (1.238.0) + aws-sdk-core (~> 3, >= 3.264.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sigv4 (1.12.1) @@ -37,18 +37,17 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - csv (3.3.6) + csv (3.3.7) declarative (0.0.20) digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) - domain_name (0.6.20260921) + domain_name (0.7.20261031) dotenv (2.8.1) emoji_regex (3.2.3) erb (6.0.7) - excon (1.7.1) - logger - faraday (2.14.4) - faraday-net_http (>= 2.0, < 3.5) + excon (1.10.0) + faraday (2.15.1) + faraday-net_http (>= 2.0, < 3.6) json logger faraday-cookie_jar (0.0.8) @@ -58,12 +57,12 @@ GEM faraday (>= 1, < 3) faraday-multipart (1.2.0) multipart-post (~> 2.0) - faraday-net_http (3.4.4) + faraday-net_http (3.5.0) net-http (~> 0.5) faraday-retry (2.4.0) faraday (~> 2.0) - fastimage (2.4.1) - fastlane (2.240.1) + fastimage (2.4.3) + fastlane (2.241.2) CFPropertyList (>= 2.3, < 5.0.0) abbrev (~> 0.1) addressable (>= 2.9.0, < 3.0.0) @@ -79,7 +78,8 @@ GEM csv (~> 3.3) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) - excon (>= 0.71.0, < 2.0.0) + erb (>= 4.0, < 7.0) + excon (>= 1.0.0, < 2.0.0) faraday (~> 2.7) faraday-cookie_jar (~> 0.0.8) faraday-follow_redirects (~> 0.3) @@ -90,7 +90,7 @@ GEM gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.99) google-apis-playcustomapp_v1 (~> 0.1) - google-cloud-env (>= 1.6.0, < 2.4.0) + google-cloud-env (>= 1.6.0, < 2.5.0) google-cloud-storage (~> 1.31) highline (~> 2.0) irb (>= 1.8) @@ -109,7 +109,7 @@ GEM rubyzip (>= 3.4.0, < 4.0.0) security (~> 0.3) simctl (~> 1.6.3) - terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-notifier (>= 3.1.0, < 4.0.0) terminal-table (~> 4) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) @@ -117,33 +117,35 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-plugin-huawei_appgallery_connect (1.1.3) + cgi fastlane-sirp (1.1.0) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.109.0) + google-apis-androidpublisher_v3 (0.111.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-core (1.2.5) + google-apis-core (1.4.1) addressable (~> 2.9) faraday (~> 2.13) faraday-follow_redirects (~> 0.3) googleauth (~> 1.14) mini_mime (~> 1.1) - multi_json (~> 1.11) - representable (~> 3.0) + multi_json (~> 1.21, >= 1.21.2) + representable (~> 3.3, >= 3.3.1) retriable (>= 3.1, < 5.0) google-apis-iamcredentials_v1 (0.28.0) google-apis-core (>= 0.15.0, < 2.a) google-apis-playcustomapp_v1 (0.18.0) google-apis-core (>= 0.15.0, < 2.a) - google-apis-storage_v1 (0.68.0) + google-apis-storage_v1 (0.70.0) google-apis-core (>= 0.15.0, < 2.a) - google-cloud-core (1.9.0) + google-cloud-core (1.9.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (2.3.1) + google-cloud-env (2.4.1) base64 (~> 0.2) faraday (>= 1.0, < 3.a) - google-cloud-errors (1.7.0) - google-cloud-storage (1.62.0) + google-cloud-errors (1.7.1) + google-cloud-storage (1.62.1) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-core (>= 0.18, < 2) @@ -152,8 +154,8 @@ GEM google-cloud-core (~> 1.6) googleauth (~> 1.9) mini_mime (~> 1.0) - google-logging-utils (0.2.0) - googleauth (1.17.4) + google-logging-utils (0.2.2) + googleauth (1.17.7) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.2) google-logging-utils (~> 0.1) @@ -164,7 +166,7 @@ GEM highline (2.0.3) http-cookie (1.1.6) domain_name (~> 0.5) - io-console (0.9.4) + io-console (0.9.5) irb (1.18.0) pp (>= 0.6.0) prism (>= 1.3.0) @@ -182,8 +184,11 @@ GEM mutex_m (0.3.0) nanaimo (0.4.0) naturally (2.3.0) - net-http (0.9.1) + net-http (0.10.0) + net-protocol (>= 0.3.0) uri (>= 0.11.1) + net-protocol (0.4.0) + timeout nkf (0.3.0) optparse (0.8.1) os (1.1.4) @@ -191,23 +196,23 @@ GEM plist (3.7.2) pp (0.6.4) prettyprint - prettyprint (0.2.0) - prism (1.9.0) - pstore (0.2.1) + prettyprint (0.2.1) + prism (2.1.0-x86_64-linux-gnu) + pstore (0.3.0) public_suffix (7.0.5) rake (13.4.2) rbs (4.2.0) logger prism (>= 1.6.0) tsort - rdoc (8.0.0) + rdoc (8.1.0) erb prism (>= 1.6.0) rbs (>= 4.0.0) tsort reline (0.7.0) io-console (~> 0.5) - representable (3.3.0) + representable (3.3.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) @@ -215,17 +220,18 @@ GEM rexml (3.4.4) rouge (3.28.0) rubyzip (3.7.0) - security (0.3.0) - signet (0.22.0) + security (0.4.0) + signet (0.22.2) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 4.0) simctl (1.6.10) CFPropertyList naturally - terminal-notifier (2.0.0) + terminal-notifier (3.1.0) terminal-table (4.0.0) unicode-display_width (>= 1.1.1, < 4) + timeout (0.6.1) trailblazer-option (0.1.2) tsort (0.2.0) tty-cursor (0.7.1) @@ -236,7 +242,7 @@ GEM unicode-display_width (3.3.0) unicode-emoji (~> 4.3) unicode-emoji (4.3.0) - uri (1.1.1) + uri (1.1.2) word_wrap (1.0.0) xcodeproj (1.28.1) CFPropertyList (>= 2.3.3, < 4.0) @@ -258,6 +264,7 @@ PLATFORMS DEPENDENCIES abbrev fastlane + fastlane-plugin-huawei_appgallery_connect BUNDLED WITH - 2.5.4 + 4.0.24