Skip to content

Commit 3fd4701

Browse files
authored
Android support (#13)
1 parent f38e9a9 commit 3fd4701

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
with_linting: true
1414
with_musl: true
1515
ios_scheme_name: Zip
16+
with_android: true
1617
secrets:
1718
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
1819

@@ -28,7 +29,7 @@ jobs:
2829
include:
2930
- { swift-version: 5.9, swift-branch: swift-5.9.2-release, swift-tag: 5.9.2-RELEASE }
3031
- { swift-version: 5.10, swift-branch: swift-5.10.1-release, swift-tag: 5.10.1-RELEASE }
31-
- { swift-version: 6.0, swift-branch: swift-6.0.1-release, swift-tag: 6.0.1-RELEASE }
32+
- { swift-version: 6.0, swift-branch: swift-6.0.3-release, swift-tag: 6.0.3-RELEASE }
3233
runs-on: windows-latest
3334
timeout-minutes: 60
3435
steps:

Sources/Zip/Zip.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public class Zip {
177177
}
178178

179179
var writeBytes: UInt64 = 0
180-
let filePointer: UnsafeMutablePointer<FILE>? = fopen(fullPath, "wb")
180+
let filePointer = fopen(fullPath, "wb")
181181
while let filePointer {
182182
let readBytes = unzReadCurrentFile(zip, &buffer, UInt32(buffer.count))
183183
guard readBytes > 0 else { break }

Tests/ZipTests/ZipTests.swift

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ import XCTest
1212

1313
final class ZipTests: XCTestCase {
1414
private func url(forResource resource: String, withExtension ext: String? = nil) -> URL? {
15-
let resourcePath = URL(fileURLWithPath: #filePath)
16-
.deletingLastPathComponent()
17-
.appendingPathComponent("TestResources")
18-
.appendingPathComponent(resource)
19-
return ext.map { resourcePath.appendingPathExtension($0) } ?? resourcePath
15+
Bundle.module.url(forResource: "TestResources/\(resource)", withExtension: ext)
2016
}
2117

2218
private func autoRemovingSandbox() throws -> URL {
@@ -183,6 +179,8 @@ final class ZipTests: XCTestCase {
183179
let expectedPermissions = 0o700
184180
#elseif os(Windows) && compiler(>=6.0)
185181
let expectedPermissions = 0o600
182+
#elseif os(Android)
183+
let expectedPermissions = 0o666
186184
#else
187185
let expectedPermissions = 0o644
188186
#endif

0 commit comments

Comments
 (0)