Skip to content

Commit ad7b224

Browse files
colemancdacolemancda
committed
Updated dependencies
1 parent 75122de commit ad7b224

File tree

1 file changed

+27
-229
lines changed

1 file changed

+27
-229
lines changed

‎Package.swift‎

Lines changed: 27 additions & 229 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,16 @@ let package = Package(
5555
branch: "feature/android-shim"
5656
),
5757
.package(
58-
url: "https://github.com/apple/swift-log",
59-
from: "1.6.3"
58+
url: "https://github.com/PureSwift/JavaLang.git",
59+
branch: "master"
60+
),
61+
.package(
62+
url: "https://github.com/PureSwift/Kotlin.git",
63+
branch: "master"
64+
),
65+
.package(
66+
url: "https://github.com/apple/swift-log",
67+
from: "1.6.3"
6068
),
6169
.package(
6270
url: "https://github.com/apple/swift-system",
@@ -142,245 +150,31 @@ let package = Package(
142150
name: "JavaKitJar",
143151
package: "swift-java"
144152
),
145-
"AndroidJavaLang",
146-
"AndroidJavaIO",
147-
//"AndroidJavaNIO",
148-
"AndroidJavaNet",
149-
"AndroidJavaTime",
150-
"AndroidJavaAWT",
151-
"AndroidJavaUtil"
152-
],
153-
swiftSettings: [
154-
.swiftLanguageMode(.v5),
155-
]
156-
),
157-
.target(
158-
name: "AndroidJavaIO",
159-
dependencies: [
160-
.product(
161-
name: "JavaKit",
162-
package: "swift-java"
163-
),
164-
.product(
165-
name: "JavaKitCollection",
166-
package: "swift-java"
167-
),
168-
.product(
169-
name: "JavaKitIO",
170-
package: "swift-java"
171-
),
172-
],
173-
exclude: ["swift-java.config"],
174-
swiftSettings: [
175-
.swiftLanguageMode(.v5),
176-
]
177-
),/*
178-
.target(
179-
name: "AndroidJavaNIO",
180-
dependencies: [
181-
.product(
182-
name: "JavaKit",
183-
package: "swift-java"
184-
),
185-
.product(
186-
name: "JavaKitCollection",
187-
package: "swift-java"
188-
),
189-
.product(
190-
name: "JavaKitIO",
191-
package: "swift-java"
192-
),
193-
"AndroidJavaLang",
194-
"AndroidJavaIO"
195-
],
196-
exclude: ["swift-java.config"],
197-
swiftSettings: [
198-
.swiftLanguageMode(.v5),
199-
]
200-
),*/
201-
.target(
202-
name: "AndroidJavaLang",
203-
dependencies: [
204-
.product(
205-
name: "JavaKit",
206-
package: "swift-java"
207-
),
208-
.product(
209-
name: "JavaKitCollection",
210-
package: "swift-java"
211-
),
212-
.product(
213-
name: "JavaKitReflection",
214-
package: "swift-java"
215-
),
216-
.product(
217-
name: "JavaKitIO",
218-
package: "swift-java"
219-
),
220-
.product(
221-
name: "JavaKitFunction",
222-
package: "swift-java"
223-
),
224-
"AndroidJavaIO"
225-
],
226-
exclude: ["swift-java.config"],
227-
swiftSettings: [
228-
.swiftLanguageMode(.v5),
229-
]
230-
),
231-
.target(
232-
name: "AndroidJavaAWT",
233-
dependencies: [
234-
.product(
235-
name: "JavaKit",
236-
package: "swift-java"
237-
),
238-
.product(
239-
name: "JavaKitCollection",
240-
package: "swift-java"
241-
),
242-
.product(
243-
name: "JavaKitReflection",
244-
package: "swift-java"
245-
),
246-
.product(
247-
name: "JavaKitIO",
248-
package: "swift-java"
249-
),
250-
"AndroidJavaIO",
251-
"AndroidJavaLang"
252-
],
253-
exclude: ["swift-java.config"],
254-
swiftSettings: [
255-
.swiftLanguageMode(.v5),
256-
]
257-
),
258-
.target(
259-
name: "AndroidJavaTime",
260-
dependencies: [
261-
.product(
262-
name: "JavaKit",
263-
package: "swift-java"
264-
),
265153
.product(
266-
name: "JavaKitCollection",
267-
package: "swift-java"
154+
name: "JavaLang",
155+
package: "JavaLang"
268156
),
269157
.product(
270-
name: "JavaKitReflection",
271-
package: "swift-java"
272-
),
273-
.product(
274-
name: "JavaKitIO",
275-
package: "swift-java"
158+
name: "JavaUtil",
159+
package: "JavaLang"
276160
),
277-
"AndroidJavaLang",
278-
"AndroidJavaIO",
279-
],
280-
exclude: ["swift-java.config"],
281-
swiftSettings: [
282-
.swiftLanguageMode(.v5),
283-
]
284-
),
285-
.target(
286-
name: "AndroidJavaNet",
287-
dependencies: [
288161
.product(
289-
name: "JavaKit",
290-
package: "swift-java"
162+
name: "JavaIO",
163+
package: "JavaLang"
291164
),
292165
.product(
293-
name: "JavaKitCollection",
294-
package: "swift-java"
166+
name: "JavaNet",
167+
package: "JavaLang"
295168
),
296169
.product(
297-
name: "JavaKitReflection",
298-
package: "swift-java"
170+
name: "JavaTime",
171+
package: "JavaLang"
299172
),
300173
.product(
301-
name: "JavaKitIO",
302-
package: "swift-java"
303-
),
304-
.product(
305-
name: "JavaKitNetwork",
306-
package: "swift-java"
307-
),
308-
"AndroidJavaIO",
309-
"AndroidJavaUtil"
310-
],
311-
exclude: ["swift-java.config"],
312-
swiftSettings: [
313-
.swiftLanguageMode(.v5),
314-
]
315-
),
316-
.target(
317-
name: "AndroidJavaUtil",
318-
dependencies: [
319-
.product(
320-
name: "JavaKit",
321-
package: "swift-java"
322-
),
323-
.product(
324-
name: "JavaKitCollection",
325-
package: "swift-java"
326-
),
327-
.product(
328-
name: "JavaKitReflection",
329-
package: "swift-java"
330-
),
331-
.product(
332-
name: "JavaKitFunction",
333-
package: "swift-java"
334-
),
335-
.product(
336-
name: "JavaKitIO",
337-
package: "swift-java"
338-
),
339-
"AndroidJavaIO",
340-
"AndroidJavaLang",
341-
"AndroidJavaTime"
342-
],
343-
exclude: ["swift-java.config"],
344-
swiftSettings: [
345-
.swiftLanguageMode(.v5),
346-
]
347-
),
348-
.target(
349-
name: "AndroidJavaBeans",
350-
dependencies: [
351-
.product(
352-
name: "JavaKit",
353-
package: "swift-java"
354-
),
355-
.product(
356-
name: "JavaKitCollection",
357-
package: "swift-java"
358-
),
359-
.product(
360-
name: "JavaKitReflection",
361-
package: "swift-java"
362-
),
363-
.product(
364-
name: "JavaKitFunction",
365-
package: "swift-java"
366-
),
367-
.product(
368-
name: "JavaKitIO",
369-
package: "swift-java"
370-
),
371-
"AndroidJavaIO"
372-
],
373-
exclude: ["swift-java.config"],
374-
swiftSettings: [
375-
.swiftLanguageMode(.v5),
376-
]
377-
),
378-
.target(
379-
name: "AndroidJavaMath",
380-
dependencies: [
381-
"AndroidJavaLang"
174+
name: "JavaAWT",
175+
package: "JavaLang"
176+
)
382177
],
383-
exclude: ["swift-java.config"],
384178
swiftSettings: [
385179
.swiftLanguageMode(.v5),
386180
]
@@ -502,6 +296,10 @@ let package = Package(
502296
.target(
503297
name: "AndroidX",
504298
dependencies: [
299+
.product(
300+
name: "Kotlin",
301+
package: "Kotlin"
302+
),
505303
"AndroidJava",
506304
"AndroidUtil",
507305
"AndroidApp",

0 commit comments

Comments
 (0)