System: update swift gradle plugin

Author: andriydruk

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.4.21'
 
     repositories {
         google()
@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
-        classpath "com.readdle.android.swift:gradle:1.3.2"
+        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath "com.readdle.android.swift:gradle:1.3.4"
         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"

compiler/build.gradle

@@ -4,7 +4,7 @@ archivesBaseName = "compiler"
 
 dependencies {
     implementation project(':library')
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.8.6'
 }
 
 apply from: rootProject.file('bintray-publish.gradle')

gradle.properties

@@ -1,4 +1,6 @@
 GROUP=com.readdle.swift.java.codegen
-VERSION_NAME=0.9.0
+VERSION_NAME=0.9.1
 
 org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX=true
+android.enableJetifier=true

sample/build.gradle

@@ -9,7 +9,6 @@ swift {
     useKapt true
     cleanEnabled true
     debug {
-        abiFilters("x86_64")
         extraBuildFlags("-Xswiftc", "-DDEBUG")
     }
 }
@@ -22,7 +21,7 @@ android {
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["com.readdle.codegen.package": """{
@@ -39,8 +38,22 @@ android {
     }
     buildTypes {
         release {
+            debuggable false
+            jniDebuggable false
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            shrinkResources false
+            ndk {
+                abiFilters = ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"]
+            }
+        }
+        debug {
+            debuggable true
+            jniDebuggable true
+            minifyEnabled false
+            shrinkResources false
+            ndk {
+                abiFilters = ["x86", "x86_64"]
+            }
         }
     }
 
@@ -68,10 +81,10 @@ dependencies {
     kapt project(':compiler')
     implementation project(':library')
 
-    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.13.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'
+    androidTestImplementation 'androidx.annotation:annotation:1.1.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

sample/src/androidTest/java/com/readdle/swiftjava/sample/BoolTests.java

@@ -1,6 +1,6 @@
 package com.readdle.swiftjava.sample;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.readdle.codegen.anotation.JavaSwift;
 

sample/src/androidTest/java/com/readdle/swiftjava/sample/DoubleTests.java

@@ -1,6 +1,6 @@
 package com.readdle.swiftjava.sample;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.readdle.codegen.anotation.JavaSwift;
 

sample/src/androidTest/java/com/readdle/swiftjava/sample/FloatTests.java

@@ -1,6 +1,6 @@
 package com.readdle.swiftjava.sample;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.readdle.codegen.anotation.JavaSwift;
 

sample/src/androidTest/java/com/readdle/swiftjava/sample/Int16Tests.java

@@ -1,6 +1,6 @@
 package com.readdle.swiftjava.sample;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.readdle.codegen.anotation.JavaSwift;
 

sample/src/androidTest/java/com/readdle/swiftjava/sample/Int32Tests.java

@@ -1,6 +1,6 @@
 package com.readdle.swiftjava.sample;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.readdle.codegen.anotation.JavaSwift;
 

sample/src/androidTest/java/com/readdle/swiftjava/sample/Int64Tests.java

@@ -1,6 +1,6 @@
 package com.readdle.swiftjava.sample;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.readdle.codegen.anotation.JavaSwift;