Skip to content

Commit 9457a4c

Browse files
committed
Dev: update dependencies with overflow fix
1 parent ea1b5c2 commit 9457a4c

File tree

5 files changed

+88
-7
lines changed

5 files changed

+88
-7
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ crashlytics-build.properties
3737

3838
# XCode
3939
*.xcodeproj
40-
Package.resolved
4140
app/src/main/swift/.idea
4241
captures
4342
.idea

sample/src/main/swift/Package.resolved

Lines changed: 52 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sample/src/main/swift/Package.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ let package = Package(
5353
products: addGenerated([
5454
]),
5555
dependencies: [
56-
.package(url: "https://github.com/readdle/java_swift.git", .exact("2.1.7")),
57-
.package(url: "https://github.com/readdle/swift-java.git", .exact("0.2.0")),
58-
.package(url: "https://github.com/readdle/swift-java-coder.git", .exact("1.0.13")),
59-
.package(url: "https://github.com/readdle/swift-anycodable.git", .exact("1.0.2")),
56+
.package(url: "https://github.com/readdle/java_swift.git", .upToNextMinor(from: "2.1.8")),
57+
.package(url: "https://github.com/readdle/swift-java.git", .upToNextMinor(from: "0.2.2")),
58+
.package(url: "https://github.com/readdle/swift-java-coder.git", .upToNextMinor(from: "1.0.16")),
59+
.package(url: "https://github.com/readdle/swift-anycodable.git", .upToNextMinor(from: "1.0.3")),
6060
],
6161
targets: addGenerated([
62-
.target(name: packageName, dependencies: ["AnyCodable"])
62+
.target(name: packageName, dependencies: ["AnyCodable", "java_swift", "JavaCoder"])
6363
])
6464
)
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
//
2+
// Created by Andrew on 1/11/18.
3+
//
4+
5+
import Foundation
6+
import java_swift
7+
import JavaCoder
8+
9+
// TODO: fix this hack
10+
private let AndroidPackage = "com/readdle/swiftjava/sample/asbtracthierarhy"
11+
12+
public extension Array {
13+
14+
// Decoding SwiftValue type with JavaCoder
15+
static func from<T>(javaObject: jobject) throws -> Array<T> where T: Decodable {
16+
// ignore forPackage for basic impl
17+
return try JavaDecoder(forPackage: AndroidPackage, missingFieldsStrategy: .ignore).decode(Array<T>.self, from: javaObject)
18+
}
19+
20+
}
21+
22+
public extension Array where Element: Encodable {
23+
24+
// Encoding SwiftValue type with JavaCoder
25+
func javaObject() throws -> jobject {
26+
// ignore forPackage for basic impl
27+
return try JavaEncoder(forPackage: AndroidPackage, missingFieldsStrategy: .ignore).encode(self)
28+
}
29+
30+
}

sample/src/main/swift/Sources/SampleAppCore/SampleReference.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public class SampleReference {
151151

152152
public func oneMoreReferenceTableOverflow(_ delegate: SampleDelegate) {
153153
// For table overflow test
154-
for i in 0 ..< 512 {
154+
for _ in 0 ..< 512 {
155155
let data = delegate.funcWithData()
156156
if data.count != 10 {
157157
fatalError("Wrong data count \(data.count) != 10")

0 commit comments

Comments
 (0)