From 9ccf0ad47a8243e19ebd3f89d2880a1d667fabc6 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Tue, 10 Nov 2026 09:15:18 +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 067a8a663..09c03f1e6 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 e5823fedc..a7160281b 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 e6b5696cd..9d3e465ac 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 c92b41155ef5d554ee1d867fdafc8334b0d27b0d Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Tue, 10 Nov 2026 09:15:18 +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 587310c03..1c8a35c18 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 2a10c52d5129295a0c93073ef582d1d6a606b643 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Tue, 10 Nov 2026 09:15:18 +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 | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 1642e64e8..906ddc55a 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 ccf8875a2..fc9c0423f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,8 +8,8 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.4.1) - aws-partitions (1.1300.0) - aws-sdk-core (3.263.0) + 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) @@ -18,11 +18,11 @@ GEM jmespath (~> 1, >= 1.6.1) logger rexml (~> 3.4, >= 3.4.2) - aws-sdk-kms (1.138.0) - aws-sdk-core (~> 3, >= 3.263.0) + aws-sdk-kms (1.139.0) + aws-sdk-core (~> 3, >= 3.264.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.237.0) - aws-sdk-core (~> 3, >= 3.263.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) @@ -117,6 +117,8 @@ 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.111.0) @@ -195,7 +197,7 @@ GEM pp (0.6.4) prettyprint prettyprint (0.2.1) - prism (1.9.0) + prism (2.1.0-x86_64-linux-gnu) pstore (0.3.0) public_suffix (7.0.5) rake (13.4.2) @@ -262,6 +264,7 @@ PLATFORMS DEPENDENCIES abbrev fastlane + fastlane-plugin-huawei_appgallery_connect BUNDLED WITH - 2.5.4 + 4.0.24