From 93207426b10c7ab763712be9f191731b2e3be931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Brey=20Vilas?= <alvaro.brey@nextcloud.com>
Date: Wed, 20 Oct 2021 14:03:03 +0200
Subject: [PATCH 1/2] fastlane: Don't use rename command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's different between linux versions

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
---
 fastlane/Fastfile | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index aefd39b49177..e6e8129fde0c 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -61,12 +61,14 @@ end
 
 desc "Release phase 1: make gplay/generic for FINAL, then test it"
 lane :Final_releasePhase1 do
-    makeReleases()
+    info = androidVersion
+    makeReleases(info)
 end
 
 desc "Release phase 2 for FINAL: checks, tag, upload gplay to playstore with values from build.gradle"
 lane :Final_releasePhase2 do |options|
     info = androidVersion
+    promptVersion(info)
     checkChangelog(info)
     checkLibrary_Final()
     checkIfScreenshotsExist()
@@ -80,14 +82,14 @@ lane :Final_releasePhase2 do |options|
 end
 
 desc "Makes gplay and generic releases in ../releases/"
-lane :makeReleases do
+lane :makeReleases do |options|
     sh("mkdir -p ../release")
     sh("rm -rf ../release/*")
     sh("rm -rf ../build")
 
     SignedRelease(flavor:"Generic")
     sh("mv ../build/outputs/apk/generic/release/*.apk ../release/")
-    sh("rename 'generic-release' 'nextcloud' ../release/generic-release*")
+    sh("mv ../release/generic-release-#{options["versionCode"]}.apk ../release/nextcloud-#{options["versionCode"]}.apk")
 
     SignedRelease(flavor:"Gplay")
     sh("cp ../build/outputs/apk/gplay/release/*.apk ../release/")
@@ -166,7 +168,7 @@ private_lane :checkIfAPKexists do |options|
 end
 
 desc "compute version"
-private_lane :androidVersion do |options|
+private_lane :androidVersion do
     File.open("../build.gradle","r") do |f|
         text = f.read
 
@@ -197,19 +199,22 @@ private_lane :androidVersion do |options|
             branch = "stable-" + major[1] + "." + minor[1]
         end
 
-        print "VersionCode: " + versionCode.to_s + "\n"
-        print "Name: " + name + "\n"
-        print "Tag: " + tag + "\n"
-        print "Branch: " + branch + "\n"
-        print "\ndisable IPv6 to upload to Gplay!!!\n"
+        { "versionCode" => versionCode.to_s, "versionName" => name, "tag" => tag, "branch" => branch }
+    end
+end
 
-        answer = prompt(text: "is this okay?", boolean: true)
+desc "Show versions and prompt for confirmation"
+private_lane :promptVersion do |options|
+    print "VersionCode: " + options["versionCode"].to_s + "\n"
+    print "Name: " + options["versionName"] + "\n"
+    print "Tag: " + options["tag"] + "\n"
+    print "Branch: " + options["branch"] + "\n"
+    print "\ndisable IPv6 to upload to Gplay!!!\n"
 
-        if !answer
-            exit
-        end
+    answer = prompt(text: "is this okay?", boolean: true)
 
-        { "versionCode" => versionCode.to_s, "versionName" => name, "tag" => tag, "branch" => branch }
+    if !answer
+        exit
     end
 end
 

From 2a7ebceabae86ee349ffe9e7e8d79eb5238fff94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Brey=20Vilas?= <alvaro.brey@nextcloud.com>
Date: Thu, 21 Oct 2021 11:33:28 +0200
Subject: [PATCH 2/2] fastlane: makeReleases: call androidVersion directly
 instead of getting from parameter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes it possible to call makeReleases directly

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
---
 fastlane/Fastfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e6e8129fde0c..7708ca37f484 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -61,8 +61,7 @@ end
 
 desc "Release phase 1: make gplay/generic for FINAL, then test it"
 lane :Final_releasePhase1 do
-    info = androidVersion
-    makeReleases(info)
+    makeReleases()
 end
 
 desc "Release phase 2 for FINAL: checks, tag, upload gplay to playstore with values from build.gradle"
@@ -82,14 +81,15 @@ lane :Final_releasePhase2 do |options|
 end
 
 desc "Makes gplay and generic releases in ../releases/"
-lane :makeReleases do |options|
+lane :makeReleases do
+    info = androidVersion
     sh("mkdir -p ../release")
     sh("rm -rf ../release/*")
     sh("rm -rf ../build")
 
     SignedRelease(flavor:"Generic")
     sh("mv ../build/outputs/apk/generic/release/*.apk ../release/")
-    sh("mv ../release/generic-release-#{options["versionCode"]}.apk ../release/nextcloud-#{options["versionCode"]}.apk")
+    sh("mv ../release/generic-release-#{info["versionCode"]}.apk ../release/nextcloud-#{info["versionCode"]}.apk")
 
     SignedRelease(flavor:"Gplay")
     sh("cp ../build/outputs/apk/gplay/release/*.apk ../release/")