AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix indentation and update dependencies

Browse Source
This commit is contained in:
Julian Raufelder 2021-07-14 14:55:37 +02:00
parent 754533ef60
commit 0f216e023c
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile.lock
View File

@ -9,8 +9,8 @@ GEM
artifactory (3.0.15) artifactory (3.0.15)
atomos (0.1.3) atomos (0.1.3)
aws-eventstream (1.1.1) aws-eventstream (1.1.1)
aws-partitions (1.475.0) aws-partitions (1.478.0)
aws-sdk-core (3.116.0) aws-sdk-core (3.117.0)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0) aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
@ -40,7 +40,7 @@ GEM
ed25519 (1.2.4) ed25519 (1.2.4)
emoji_regex (3.2.2) emoji_regex (3.2.2)
excon (0.84.0) excon (0.84.0)
faraday (1.5.0) faraday (1.5.1)
faraday-em_http (~> 1.0) faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0) faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1) faraday-excon (~> 1.1)
@ -58,7 +58,7 @@ GEM
faraday-excon (1.1.0) faraday-excon (1.1.0)
faraday-httpclient (1.0.1) faraday-httpclient (1.0.1)
faraday-net_http (1.0.1) faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0) faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0) faraday-patron (1.0.0)
faraday_middleware (1.0.0) faraday_middleware (1.0.0)
faraday (~> 1.0) faraday (~> 1.0)

48
fastlane/Fastfile
View File

@ -9,7 +9,7 @@ default_platform(:android)
build = number_of_commits + 1958 # adding 1958 for legacy reasons. Must be in sync with getVersionCode() from build.gradle build = number_of_commits + 1958 # adding 1958 for legacy reasons. Must be in sync with getVersionCode() from build.gradle
version = get_version_name( version = get_version_name(
gradle_file_path:"build.gradle", gradle_file_path:"build.gradle",
ext_constant_name:"androidVersionName") ext_constant_name:"androidVersionName")
version = version.delete "'" version = version.delete "'"
release_note_path_en = "metadata/android/en-US/changelogs/default.txt" release_note_path_en = "metadata/android/en-US/changelogs/default.txt"
@ -184,31 +184,31 @@ platform :android do |options|
checkTrackingAddedInDependency(alpha:options[:alpha], beta:options[:beta]) checkTrackingAddedInDependency(alpha:options[:alpha], beta:options[:beta])
if options[:alpha] or options[:beta] if options[:alpha] or options[:beta]
puts "Skipping deployment to F-Droid cause there isn't currently a alpha/beta channel" puts "Skipping deployment to F-Droid cause there isn't currently a alpha/beta channel"
else else
puts "Updating F-Droid" puts "Updating F-Droid"
FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "repo/Cryptomator.apk") FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "repo/Cryptomator.apk")
sh("cp -r metadata/android/ metadata/org.cryptomator/") sh("cp -r metadata/android/ metadata/org.cryptomator/")
FileUtils.cp("metadata/org.cryptomator/en-US/changelogs/default.txt", "metadata/org.cryptomator/en-US/changelogs/#{version}.txt") FileUtils.cp("metadata/org.cryptomator/en-US/changelogs/default.txt", "metadata/org.cryptomator/en-US/changelogs/#{version}.txt")
FileUtils.cp("metadata/org.cryptomator/de-DE/changelogs/default.txt", "metadata/org.cryptomator/de-DE/changelogs/#{version}.txt") FileUtils.cp("metadata/org.cryptomator/de-DE/changelogs/default.txt", "metadata/org.cryptomator/de-DE/changelogs/#{version}.txt")
sh("fdroid update && fdroid rewritemeta") sh("fdroid update && fdroid rewritemeta")
sh("rm -r metadata/org.cryptomator/") sh("rm -r metadata/org.cryptomator/")
aws_s3( aws_s3(
bucket: ENV['S3_BUCKET'], bucket: ENV['S3_BUCKET'],
endpoint: ENV['S3_ENDPOINT'], endpoint: ENV['S3_ENDPOINT'],
region: ENV['S3_REGION'], region: ENV['S3_REGION'],
access_key: ENV['S3_ACCESS_KEY'], access_key: ENV['S3_ACCESS_KEY'],
secret_access_key: ENV['S3_SECRET_ACCESS_KEY'], secret_access_key: ENV['S3_SECRET_ACCESS_KEY'],
path: "android/fdroid", path: "android/fdroid",
folder: "fastlane/repo", folder: "fastlane/repo",
skip_html_upload: true, skip_html_upload: true,
apk: '' apk: ''
) )
end end
FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "release/Cryptomator-#{version}_fdroid_signed.apk") FileUtils.cp(lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH], "release/Cryptomator-#{version}_fdroid_signed.apk")
end end
@ -218,7 +218,7 @@ platform :android do |options|
puts "Check if script file is latest" puts "Check if script file is latest"
sh("wget -O current_iod-scan-apk.php https://gitlab.com/fdroid/issuebot/-/raw/master/modules/iod-scan-apk.php") sh("wget -O current_iod-scan-apk.php https://gitlab.com/fdroid/issuebot/-/raw/master/modules/iod-scan-apk.php")
same_script = FileUtils.compare_file("iod-scan-apk.php", "current_iod-scan-apk.php") same_script = FileUtils.compare_file("iod-scan-apk.php", "current_iod-scan-apk.php")
if same_script if same_script
puts "Script file unchanged" puts "Script file unchanged"
FileUtils.rm("current_iod-scan-apk.php") FileUtils.rm("current_iod-scan-apk.php")