Dev: migrate to new swift plugin

Author: Anton Pogonets

build.gradle

@@ -1,14 +1,19 @@
 buildscript {
+    ext.kotlin_version = '1.3.50'
+
     repositories {
         google()
         jcenter()
+        mavenLocal()
         maven { url "https://dl.bintray.com/readdle/maven" }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
-        classpath 'com.readdle.android.swift:gradle:1.1.10'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath "com.android.tools.build:gradle:3.5.0"
+        classpath "com.readdle.android.swift:gradle:1.3.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Apr 29 18:40:15 EEST 2018
+#Thu Aug 29 12:50:13 EEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

sample/build.gradle

@@ -1,9 +1,13 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.readdle.android.swift'
 
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
 swift {
     cleanEnabled true
     debug {
+        abiFilters("arm64-v8a", "x86_64")
         extraBuildFlags("-Xswiftc", "-DDEBUG")
     }
 }
@@ -30,10 +34,10 @@ dependencies {
     annotationProcessor project(':compiler')
     implementation project(':library')
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support:support-annotations:27.1.1'
+    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

sample/src/main/swift/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 import Foundation
 import PackageDescription
 
@@ -9,15 +9,11 @@ let generatedName = "Generated"
 let generatedPath = ".build/\(generatedName.lowercased())"
 
 let isSourcesGenerated: Bool = {
-    let basePath = URL(fileURLWithPath: #file)
-            .deletingLastPathComponent()
-            .path
-
-    let fileManager = FileManager()
-    fileManager.changeCurrentDirectoryPath(basePath)
+    let baseURL = URL(fileURLWithPath: #file).deletingLastPathComponent()
+    let generatedURL = baseURL.appendingPathComponent(generatedPath)
 
     var isDirectory: ObjCBool = false
-    let exists = fileManager.fileExists(atPath: generatedPath, isDirectory: &isDirectory)
+    let exists = FileManager.default.fileExists(atPath: generatedURL.path, isDirectory: &isDirectory)
 
     return exists && isDirectory.boolValue
 }()
@@ -41,7 +37,7 @@ func addGenerated(_ targets: [Target]) -> [Target] {
         .target(
             name: generatedName,
             dependencies: [
-                .byNameItem(name: packageName),
+                .byName(name: packageName),
                 "java_swift",
                 "Java",
                 "JavaCoder",
@@ -57,13 +53,12 @@ let package = Package(
     products: addGenerated([
     ]),
     dependencies: [
-        .package(url: "https://github.com/readdle/java_swift.git", .exact("2.1.3")),
-        .package(url: "https://github.com/readdle/swift-java.git", .exact("0.1.5")),
-        .package(url: "https://github.com/readdle/swift-java-coder.git", .exact("1.0.5")),
-        .package(url: "https://github.com/readdle/swift-anycodable.git", .exact("1.0.0")),
+        .package(url: "https://github.com/readdle/java_swift.git", .exact("2.1.7")),
+        .package(url: "https://github.com/readdle/swift-java.git", .exact("0.2.0")),
+        .package(url: "https://github.com/readdle/swift-java-coder.git", .exact("1.0.13")),
+        .package(url: "https://github.com/readdle/swift-anycodable.git", .exact("1.0.2")),
     ],
     targets: addGenerated([
         .target(name: packageName, dependencies: ["AnyCodable"])
-    ]),
-    swiftLanguageVersions: [4]
+    ])
 )