Skip to content

Commit 4626721

Browse files
author
Jan Guegel
committed
Merge remote-tracking branch 'origin/main' into nested-folders-102
2 parents 1a78dba + 9f5b41d commit 4626721

File tree

29 files changed

+203
-130
lines changed

29 files changed

+203
-130
lines changed

.fossify/release-marker.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Auto-generated file. DO NOT EDIT.
2-
1.5.0
2+
1.6.1

.github/dependabot.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ registries:
1111

1212
jitpack:
1313
type: maven-repository
14-
url: "https://jitpack.io"
14+
url: "https://www.jitpack.io"
1515

1616
updates:
1717
- package-ecosystem: "bundler"
@@ -35,6 +35,8 @@ updates:
3535
prefix: "chore"
3636
prefix-development: "chore"
3737
include: "scope"
38+
ignore:
39+
- dependency-name: "org.fossify:commons"
3840

3941
- package-ecosystem: "github-actions"
4042
directory: "/"

.github/workflows/pr.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ name: PR
22

33
on:
44
pull_request:
5-
branches: [ main ]
5+
branches: [main]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: read
610

711
jobs:
812
call-pr-workflow:

.github/workflows/testing-build.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ on:
44
pull_request:
55
branches: [main]
66
types: [labeled, opened, synchronize, reopened]
7+
paths-ignore:
8+
- ".github/**"
9+
- "CHANGELOG.md"
10+
- "docs/**"
11+
- "fastlane/**"
12+
- "LICENSE"
13+
- "README.md"
714

815
jobs:
916
call-testing-build-workflow:

CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
### Fixed
99
- Fixed cleanup after moving nested folders ([#102])
1010

11+
## [1.6.1] - 2026-02-14
12+
### Changed
13+
- Updated translations
14+
15+
### Fixed
16+
- Fixed file size calculations to use SI decimal units (divide by 1000)
17+
18+
## [1.6.0] - 2026-01-30
19+
### Added
20+
- Added support for custom fonts
21+
22+
### Changed
23+
- Updated translations
24+
1125
## [1.5.0] - 2025-12-16
1226
### Changed
1327
- Updated translations
@@ -123,7 +137,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
123137
[#251]: https://github.com/FossifyOrg/File-Manager/issues/251
124138
[#267]: https://github.com/FossifyOrg/File-Manager/issues/267
125139

126-
[Unreleased]: https://github.com/FossifyOrg/File-Manager/compare/1.5.0...HEAD
140+
[Unreleased]: https://github.com/FossifyOrg/File-Manager/compare/1.6.1...HEAD
141+
[1.6.1]: https://github.com/FossifyOrg/File-Manager/compare/1.6.0...1.6.1
142+
[1.6.0]: https://github.com/FossifyOrg/File-Manager/compare/1.5.0...1.6.0
127143
[1.5.0]: https://github.com/FossifyOrg/File-Manager/compare/1.4.0...1.5.0
128144
[1.4.0]: https://github.com/FossifyOrg/File-Manager/compare/1.3.1...1.4.0
129145
[1.3.1]: https://github.com/FossifyOrg/File-Manager/compare/1.3.0...1.3.1

Gemfile.lock

Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,27 @@ GEM
88
artifactory (3.0.17)
99
atomos (0.1.3)
1010
aws-eventstream (1.4.0)
11-
aws-partitions (1.1196.0)
12-
aws-sdk-core (3.240.0)
11+
aws-partitions (1.1213.0)
12+
aws-sdk-core (3.242.0)
1313
aws-eventstream (~> 1, >= 1.3.0)
1414
aws-partitions (~> 1, >= 1.992.0)
1515
aws-sigv4 (~> 1.9)
1616
base64
1717
bigdecimal
1818
jmespath (~> 1, >= 1.6.1)
1919
logger
20-
aws-sdk-kms (1.118.0)
21-
aws-sdk-core (~> 3, >= 3.239.1)
20+
aws-sdk-kms (1.121.0)
21+
aws-sdk-core (~> 3, >= 3.241.4)
2222
aws-sigv4 (~> 1.5)
23-
aws-sdk-s3 (1.208.0)
24-
aws-sdk-core (~> 3, >= 3.234.0)
23+
aws-sdk-s3 (1.213.0)
24+
aws-sdk-core (~> 3, >= 3.241.4)
2525
aws-sdk-kms (~> 1)
2626
aws-sigv4 (~> 1.5)
2727
aws-sigv4 (1.12.1)
2828
aws-eventstream (~> 1, >= 1.0.2)
2929
babosa (1.0.4)
3030
base64 (0.2.0)
31+
benchmark (0.5.0)
3132
bigdecimal (4.0.1)
3233
claide (1.1.0)
3334
colored (1.2)
@@ -42,7 +43,7 @@ GEM
4243
dotenv (2.8.1)
4344
emoji_regex (3.2.3)
4445
excon (0.112.0)
45-
faraday (1.10.4)
46+
faraday (1.10.5)
4647
faraday-em_http (~> 1.0)
4748
faraday-em_synchrony (~> 1.0)
4849
faraday-excon (~> 1.1)
@@ -61,7 +62,7 @@ GEM
6162
faraday-em_synchrony (1.0.1)
6263
faraday-excon (1.1.0)
6364
faraday-httpclient (1.0.1)
64-
faraday-multipart (1.1.1)
65+
faraday-multipart (1.2.0)
6566
multipart-post (~> 2.0)
6667
faraday-net_http (1.0.2)
6768
faraday-net_http_persistent (1.2.0)
@@ -71,15 +72,16 @@ GEM
7172
faraday_middleware (1.2.1)
7273
faraday (~> 1.0)
7374
fastimage (2.4.0)
74-
fastlane (2.229.1)
75+
fastlane (2.232.1)
7576
CFPropertyList (>= 2.3, < 4.0.0)
7677
abbrev (~> 0.1.2)
7778
addressable (>= 2.8, < 3.0.0)
7879
artifactory (~> 3.0)
79-
aws-sdk-s3 (~> 1.0)
80+
aws-sdk-s3 (~> 1.197)
8081
babosa (>= 1.0.3, < 2.0.0)
8182
base64 (~> 0.2.0)
82-
bundler (>= 1.12.0, < 3.0.0)
83+
benchmark (>= 0.1.0)
84+
bundler (>= 1.17.3, < 5.0.0)
8385
colored (~> 1.2)
8486
commander (~> 4.6)
8587
csv (~> 3.3)
@@ -94,18 +96,20 @@ GEM
9496
gh_inspector (>= 1.1.2, < 2.0.0)
9597
google-apis-androidpublisher_v3 (~> 0.3)
9698
google-apis-playcustomapp_v1 (~> 0.1)
97-
google-cloud-env (>= 1.6.0, < 2.0.0)
99+
google-cloud-env (>= 1.6.0, <= 2.1.1)
98100
google-cloud-storage (~> 1.31)
99101
highline (~> 2.0)
100102
http-cookie (~> 1.0.5)
101103
json (< 3.0.0)
102104
jwt (>= 2.1.0, < 3)
105+
logger (>= 1.6, < 2.0)
103106
mini_magick (>= 4.9.4, < 5.0.0)
104107
multipart-post (>= 2.0.0, < 3.0.0)
105108
mutex_m (~> 0.3.0)
106109
naturally (~> 2.2)
107110
nkf (~> 0.2.0)
108111
optparse (>= 0.1.1, < 1.0.0)
112+
ostruct (>= 0.1.0)
109113
plist (>= 3.1.0, < 4.0.0)
110114
rubyzip (>= 2.0.0, < 3.0.0)
111115
security (= 0.1.5)
@@ -123,38 +127,40 @@ GEM
123127
fastlane-sirp (1.0.0)
124128
sysrandom (~> 1.0)
125129
gh_inspector (1.1.3)
126-
google-apis-androidpublisher_v3 (0.54.0)
127-
google-apis-core (>= 0.11.0, < 2.a)
128-
google-apis-core (0.11.3)
130+
google-apis-androidpublisher_v3 (0.96.0)
131+
google-apis-core (>= 0.15.0, < 2.a)
132+
google-apis-core (0.18.0)
129133
addressable (~> 2.5, >= 2.5.1)
130-
googleauth (>= 0.16.2, < 2.a)
131-
httpclient (>= 2.8.1, < 3.a)
134+
googleauth (~> 1.9)
135+
httpclient (>= 2.8.3, < 3.a)
132136
mini_mime (~> 1.0)
137+
mutex_m
133138
representable (~> 3.0)
134139
retriable (>= 2.0, < 4.a)
135-
rexml
136-
google-apis-iamcredentials_v1 (0.17.0)
137-
google-apis-core (>= 0.11.0, < 2.a)
138-
google-apis-playcustomapp_v1 (0.13.0)
139-
google-apis-core (>= 0.11.0, < 2.a)
140-
google-apis-storage_v1 (0.31.0)
141-
google-apis-core (>= 0.11.0, < 2.a)
140+
google-apis-iamcredentials_v1 (0.26.0)
141+
google-apis-core (>= 0.15.0, < 2.a)
142+
google-apis-playcustomapp_v1 (0.17.0)
143+
google-apis-core (>= 0.15.0, < 2.a)
144+
google-apis-storage_v1 (0.60.0)
145+
google-apis-core (>= 0.15.0, < 2.a)
142146
google-cloud-core (1.8.0)
143147
google-cloud-env (>= 1.0, < 3.a)
144148
google-cloud-errors (~> 1.0)
145-
google-cloud-env (1.6.0)
146-
faraday (>= 0.17.3, < 3.0)
149+
google-cloud-env (2.1.1)
150+
faraday (>= 1.0, < 3.a)
147151
google-cloud-errors (1.5.0)
148-
google-cloud-storage (1.47.0)
152+
google-cloud-storage (1.58.0)
149153
addressable (~> 2.8)
150154
digest-crc (~> 0.4)
151-
google-apis-iamcredentials_v1 (~> 0.1)
152-
google-apis-storage_v1 (~> 0.31.0)
155+
google-apis-core (>= 0.18, < 2)
156+
google-apis-iamcredentials_v1 (~> 0.18)
157+
google-apis-storage_v1 (>= 0.42)
153158
google-cloud-core (~> 1.6)
154-
googleauth (>= 0.16.2, < 2.a)
159+
googleauth (~> 1.9)
155160
mini_mime (~> 1.0)
156-
googleauth (1.8.1)
157-
faraday (>= 0.17.3, < 3.a)
161+
googleauth (1.11.2)
162+
faraday (>= 1.0, < 3.a)
163+
google-cloud-env (~> 2.1)
158164
jwt (>= 1.4, < 3.0)
159165
multi_json (~> 1.11)
160166
os (>= 0.9, < 2.0)
@@ -165,22 +171,23 @@ GEM
165171
httpclient (2.9.0)
166172
mutex_m
167173
jmespath (1.6.2)
168-
json (2.17.1)
174+
json (2.18.1)
169175
jwt (2.10.2)
170176
base64
171177
logger (1.7.0)
172178
mini_magick (4.13.2)
173179
mini_mime (1.1.5)
174-
multi_json (1.18.0)
180+
multi_json (1.19.1)
175181
multipart-post (2.4.1)
176182
mutex_m (0.3.0)
177183
nanaimo (0.4.0)
178184
naturally (2.3.0)
179185
nkf (0.2.0)
180-
optparse (0.8.0)
186+
optparse (0.8.1)
181187
os (1.1.4)
188+
ostruct (0.6.3)
182189
plist (3.7.2)
183-
public_suffix (7.0.0)
190+
public_suffix (7.0.2)
184191
rake (13.3.1)
185192
representable (3.2.0)
186193
declarative (< 0.1.0)

app/build.gradle.kts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import java.io.FileInputStream
55

66
plugins {
77
alias(libs.plugins.android)
8-
alias(libs.plugins.kotlinAndroid)
98
alias(libs.plugins.detekt)
109
}
1110

@@ -22,6 +21,11 @@ fun hasSigningVars(): Boolean {
2221
&& providers.environmentVariable("SIGNING_STORE_PASSWORD").orNull != null
2322
}
2423

24+
base {
25+
val versionCode = project.property("VERSION_CODE").toString().toInt()
26+
archivesName = "file-manager-$versionCode"
27+
}
28+
2529
android {
2630
compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt()
2731

@@ -33,7 +37,6 @@ android {
3337
versionCode = project.property("VERSION_CODE").toString().toInt()
3438
multiDexEnabled = true
3539
vectorDrawables.useSupportLibrary = true
36-
setProperty("archivesBaseName", "file-manager-$versionCode")
3740
}
3841

3942
signingConfigs {
@@ -85,7 +88,7 @@ android {
8588
}
8689

8790
sourceSets {
88-
getByName("main").java.srcDirs("src/main/kotlin")
91+
getByName("main").java.directories.add("src/main/kotlin")
8992
}
9093

9194
compileOptions {

0 commit comments

Comments
 (0)