Skip to content

Commit 842454c

Browse files
SailRealSailReal
committed
Merge branch 'release/1.8.0'
2 parents 1102b82 + a97cb0b commit 842454c

File tree

446 files changed

+5524
-5263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

446 files changed

+5524
-5263
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ local.properties
4343

4444
# fastlane
4545
**/fastlane/.env
46-
**/fastlane/metadata/**/images/**
4746
**/fastlane/report.xml
4847

4948
# fdroid

‎Gemfile.lock‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.5)
4+
CFPropertyList (3.0.6)
55
rexml
6-
addressable (2.8.0)
7-
public_suffix (>= 2.0.2, < 5.0)
6+
addressable (2.8.1)
7+
public_suffix (>= 2.0.2, < 6.0)
88
apktools (0.7.4)
99
rubyzip (~> 2.0)
1010
artifactory (3.0.15)
1111
atomos (0.1.3)
1212
aws-eventstream (1.2.0)
13-
aws-partitions (1.587.0)
14-
aws-sdk-core (3.130.2)
13+
aws-partitions (1.723.0)
14+
aws-sdk-core (3.170.0)
1515
aws-eventstream (~> 1, >= 1.0.2)
16-
aws-partitions (~> 1, >= 1.525.0)
16+
aws-partitions (~> 1, >= 1.651.0)
17+
aws-sigv4 (~> 1.5)
18+
jmespath (~> 1, >= 1.6.1)
19+
aws-sdk-kms (1.63.0)
20+
aws-sdk-core (~> 3, >= 3.165.0)
1721
aws-sigv4 (~> 1.1)
18-
jmespath (~> 1.0)
19-
aws-sdk-kms (1.56.0)
20-
aws-sdk-core (~> 3, >= 3.127.0)
21-
aws-sigv4 (~> 1.1)
22-
aws-sdk-s3 (1.114.0)
23-
aws-sdk-core (~> 3, >= 3.127.0)
22+
aws-sdk-s3 (1.119.1)
23+
aws-sdk-core (~> 3, >= 3.165.0)
2424
aws-sdk-kms (~> 1)
2525
aws-sigv4 (~> 1.4)
26-
aws-sigv4 (1.5.0)
26+
aws-sigv4 (1.5.2)
2727
aws-eventstream (~> 1, >= 1.0.2)
2828
babosa (1.0.4)
2929
bcrypt_pbkdf (1.1.0)
@@ -37,11 +37,11 @@ GEM
3737
rake (>= 12.0.0, < 14.0.0)
3838
domain_name (0.5.20190701)
3939
unf (>= 0.0.5, < 1.0.0)
40-
dotenv (2.7.6)
40+
dotenv (2.8.1)
4141
ed25519 (1.3.0)
4242
emoji_regex (3.2.3)
43-
excon (0.92.3)
44-
faraday (1.10.0)
43+
excon (0.99.0)
44+
faraday (1.10.3)
4545
faraday-em_http (~> 1.0)
4646
faraday-em_synchrony (~> 1.0)
4747
faraday-excon (~> 1.1)
@@ -60,8 +60,8 @@ GEM
6060
faraday-em_synchrony (1.0.0)
6161
faraday-excon (1.1.0)
6262
faraday-httpclient (1.0.1)
63-
faraday-multipart (1.0.3)
64-
multipart-post (>= 1.2, < 3)
63+
faraday-multipart (1.0.4)
64+
multipart-post (~> 2)
6565
faraday-net_http (1.0.1)
6666
faraday-net_http_persistent (1.2.0)
6767
faraday-patron (1.0.0)
@@ -70,7 +70,7 @@ GEM
7070
faraday_middleware (1.2.0)
7171
faraday (~> 1.0)
7272
fastimage (2.2.6)
73-
fastlane (2.205.2)
73+
fastlane (2.212.1)
7474
CFPropertyList (>= 2.3, < 4.0.0)
7575
addressable (>= 2.8, < 3.0.0)
7676
artifactory (~> 3.0)
@@ -115,9 +115,9 @@ GEM
115115
mime-types (~> 3.3)
116116
fastlane-plugin-get_version_name (0.2.2)
117117
gh_inspector (1.1.3)
118-
google-apis-androidpublisher_v3 (0.20.0)
119-
google-apis-core (>= 0.4, < 2.a)
120-
google-apis-core (0.4.2)
118+
google-apis-androidpublisher_v3 (0.35.0)
119+
google-apis-core (>= 0.11.0, < 2.a)
120+
google-apis-core (0.11.0)
121121
addressable (~> 2.5, >= 2.5.1)
122122
googleauth (>= 0.16.2, < 2.a)
123123
httpclient (>= 2.8.1, < 3.a)
@@ -126,59 +126,59 @@ GEM
126126
retriable (>= 2.0, < 4.a)
127127
rexml
128128
webrick
129-
google-apis-iamcredentials_v1 (0.10.0)
130-
google-apis-core (>= 0.4, < 2.a)
131-
google-apis-playcustomapp_v1 (0.7.0)
132-
google-apis-core (>= 0.4, < 2.a)
133-
google-apis-storage_v1 (0.13.0)
134-
google-apis-core (>= 0.4, < 2.a)
129+
google-apis-iamcredentials_v1 (0.17.0)
130+
google-apis-core (>= 0.11.0, < 2.a)
131+
google-apis-playcustomapp_v1 (0.13.0)
132+
google-apis-core (>= 0.11.0, < 2.a)
133+
google-apis-storage_v1 (0.19.0)
134+
google-apis-core (>= 0.9.0, < 2.a)
135135
google-cloud-core (1.6.0)
136136
google-cloud-env (~> 1.0)
137137
google-cloud-errors (~> 1.0)
138138
google-cloud-env (1.6.0)
139139
faraday (>= 0.17.3, < 3.0)
140-
google-cloud-errors (1.2.0)
141-
google-cloud-storage (1.36.2)
140+
google-cloud-errors (1.3.1)
141+
google-cloud-storage (1.44.0)
142142
addressable (~> 2.8)
143143
digest-crc (~> 0.4)
144144
google-apis-iamcredentials_v1 (~> 0.1)
145-
google-apis-storage_v1 (~> 0.1)
145+
google-apis-storage_v1 (~> 0.19.0)
146146
google-cloud-core (~> 1.6)
147147
googleauth (>= 0.16.2, < 2.a)
148148
mini_mime (~> 1.0)
149-
googleauth (1.1.3)
149+
googleauth (1.3.0)
150150
faraday (>= 0.17.3, < 3.a)
151151
jwt (>= 1.4, < 3.0)
152152
memoist (~> 0.16)
153153
multi_json (~> 1.11)
154154
os (>= 0.9, < 2.0)
155155
signet (>= 0.16, < 2.a)
156156
highline (2.0.3)
157-
http-cookie (1.0.4)
157+
http-cookie (1.0.5)
158158
domain_name (~> 0.5)
159159
httpclient (2.8.3)
160-
jmespath (1.6.1)
161-
json (2.6.1)
162-
jwt (2.3.0)
160+
jmespath (1.6.2)
161+
json (2.6.3)
162+
jwt (2.7.0)
163163
memoist (0.16.2)
164164
mime-types (3.4.1)
165165
mime-types-data (~> 3.2015)
166-
mime-types-data (3.2022.0105)
167-
mini_magick (4.11.0)
166+
mime-types-data (3.2023.0218.1)
167+
mini_magick (4.12.0)
168168
mini_mime (1.1.2)
169169
multi_json (1.15.0)
170170
multipart-post (2.0.0)
171171
nanaimo (0.3.0)
172172
naturally (2.2.1)
173-
net-sftp (3.0.0)
174-
net-ssh (>= 5.0.0, < 7.0.0)
175-
net-ssh (6.1.0)
173+
net-sftp (4.0.0)
174+
net-ssh (>= 5.0.0, < 8.0.0)
175+
net-ssh (7.0.1)
176176
optparse (0.1.1)
177177
os (1.1.4)
178-
plist (3.6.0)
179-
public_suffix (4.0.7)
178+
plist (3.7.0)
179+
public_suffix (5.0.1)
180180
rake (13.0.6)
181-
representable (3.1.1)
181+
representable (3.2.0)
182182
declarative (< 0.1.0)
183183
trailblazer-option (>= 0.1.1, < 0.2.0)
184184
uber (< 0.2.0)
@@ -188,12 +188,12 @@ GEM
188188
ruby2_keywords (0.0.5)
189189
rubyzip (2.3.2)
190190
security (0.1.3)
191-
signet (0.16.1)
191+
signet (0.17.0)
192192
addressable (~> 2.8)
193-
faraday (>= 0.17.5, < 3.0)
193+
faraday (>= 0.17.5, < 3.a)
194194
jwt (>= 1.5, < 3.0)
195195
multi_json (~> 1.10)
196-
simctl (1.6.8)
196+
simctl (1.6.10)
197197
CFPropertyList
198198
naturally
199199
terminal-notifier (2.0.0)
@@ -207,11 +207,11 @@ GEM
207207
uber (0.1.0)
208208
unf (0.1.4)
209209
unf_ext
210-
unf_ext (0.0.8.1)
210+
unf_ext (0.0.8.2)
211211
unicode-display_width (1.8.0)
212-
webrick (1.7.0)
212+
webrick (1.8.1)
213213
word_wrap (1.0.0)
214-
xcodeproj (1.21.0)
214+
xcodeproj (1.22.0)
215215
CFPropertyList (>= 2.3.3, < 4.0)
216216
atomos (~> 0.1.3)
217217
claide (>= 1.0.2, < 2.0)

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apply from: 'buildsystem/dependencies.gradle'
22
apply plugin: "com.vanniktech.android.junit.jacoco"
33

44
buildscript {
5-
ext.kotlin_version = '1.6.21'
5+
ext.kotlin_version = '1.7.20'
66
repositories {
77
mavenCentral()
88
google()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:7.1.3'
11+
classpath 'com.android.tools.build:gradle:7.3.1'
1212
classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
1313
classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -39,7 +39,7 @@ allprojects {
3939
ext {
4040
androidApplicationId = 'org.cryptomator'
4141
androidVersionCode = getVersionCode()
42-
androidVersionName = '1.7.5'
42+
androidVersionName = '1.8.0'
4343
}
4444
repositories {
4545
mavenCentral()

‎buildsystem/Dockerfile‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# From https://github.com/signalapp/Signal-Android
2+
3+
# This Docker image can be used to build the 'lite' flavor of Cryptomator for Android
4+
# To build it
5+
# 1. Clone this repository
6+
# 2. Checkout the tag you want to build, e.g. 1.8.0
7+
# 3. Build the image using `docker build -t cryptomator-android .` in this directory
8+
# 4. Build Cryptomator using `docker run --rm -u $(id -u):$(id -g) -v $(pwd):/project -w /project cryptomator-android ./gradlew clean assembleLiteRelease` in the root of this project
9+
10+
FROM debian:bullseye
11+
12+
COPY docker/ docker/
13+
COPY docker/apt.conf docker/sources.list /etc/apt/
14+
15+
RUN dpkg --add-architecture i386
16+
17+
RUN apt-get update -y && apt-get install -y apt-utils wget git unzip
18+
19+
RUN apt-get update -y && apt-get install -y $(cat docker/dependencies.txt)
20+
RUN docker/print-versions.sh docker/dependencies.txt
21+
22+
ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-8512546_latest.zip
23+
ENV ANDROID_API_LEVELS android-33
24+
ENV ANDROID_BUILD_TOOLS_VERSION 33.0.0
25+
26+
ENV ANDROID_HOME /usr/local/android-sdk-linux
27+
ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin
28+
29+
RUN cd /usr/local/
30+
RUN wget -q "https://dl.google.com/android/repository/${ANDROID_COMMAND_LINE_TOOLS_FILENAME}"
31+
RUN unzip ${ANDROID_COMMAND_LINE_TOOLS_FILENAME} -d /usr/local/android-sdk-linux
32+
RUN rm ${ANDROID_COMMAND_LINE_TOOLS_FILENAME}
33+
34+
RUN yes | sdkmanager --update --sdk_root="${ANDROID_HOME}"
35+
RUN yes | sdkmanager --sdk_root="${ANDROID_HOME}" "platforms;${ANDROID_API_LEVELS}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}"
36+
37+
RUN yes | sdkmanager --licenses --sdk_root="${ANDROID_HOME}"
38+
RUN update-java-alternatives -s java-1.11.0-openjdk-amd64
39+
40+
RUN rm -rf ${ANDROID_HOME}/tools

0 commit comments

Comments
 (0)