System: update build scripts for Swift 5.4

Author: andriydruk

.github/workflows/android_x86.yml

@@ -13,12 +13,12 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Install Swift toolchain 5.0.3 
-      run: wget https://swift.org/builds/swift-5.0.3-release/xcode/swift-5.0.3-RELEASE/swift-5.0.3-RELEASE-osx.pkg;
-        sudo installer -pkg swift-5.0.3-RELEASE-osx.pkg -target /
+    - name: Install Swift toolchain 5.4.2
+      run: wget https://swift.org/builds/swift-5.4.2-release/xcode/swift-5.4.2-RELEASE/swift-5.4.2-RELEASE-osx.pkg;
+        sudo installer -pkg swift-5.4.2-RELEASE-osx.pkg -target /
     - name: Install NDK
-      run: wget https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip;
-        unzip android-ndk-r17c-darwin-x86_64.zip
+      run: wget https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip;
+        unzip android-ndk-r21e-darwin-x86_64.zip
     - name: Install Swift Android Toolchain
       run: SWIFT_ANDROID=$(curl --silent "https://api.github.com/repos/readdle/swift-android-toolchain/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/');
         wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-$SWIFT_ANDROID.zip;
@@ -33,8 +33,8 @@ jobs:
     - name: Start Android Emulator
       run: $ANDROID_HOME/emulator/emulator -no-window -avd ci-test -noaudio > /dev/null &
     - name: Run connected android tests
-      run: export TOOLCHAINS=org.swift.50320190830a;
-        export ANDROID_NDK_HOME=$(pwd)/android-ndk-r17c;
+      run: export TOOLCHAINS=org.swift.540202104261a;
+        export ANDROID_NDK_HOME=$(pwd)/android-ndk-r21e;
         export SWIFT_ANDROID_HOME=$(pwd)/swift-android-current;
         export PATH=$ANDROID_NDK_HOME:$PATH;
         export PATH=$SWIFT_ANDROID_HOME/bin:$SWIFT_ANDROID_HOME/build-tools/current:$PATH;

.github/workflows/android_x86_64.yml

@@ -13,12 +13,12 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Install Swift toolchain 5.0.3 
-      run: wget https://swift.org/builds/swift-5.0.3-release/xcode/swift-5.0.3-RELEASE/swift-5.0.3-RELEASE-osx.pkg;
-        sudo installer -pkg swift-5.0.3-RELEASE-osx.pkg -target /
+    - name: Install Swift toolchain 5.4.2
+      run: wget https://swift.org/builds/swift-5.4.2-release/xcode/swift-5.4.2-RELEASE/swift-5.4.2-RELEASE-osx.pkg;
+        sudo installer -pkg swift-5.4.2-RELEASE-osx.pkg -target /
     - name: Install NDK
-      run: wget https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip;
-        unzip android-ndk-r17c-darwin-x86_64.zip
+      run: wget https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip;
+        unzip android-ndk-r21e-darwin-x86_64.zip
     - name: Install Swift Android Toolchain
       run: SWIFT_ANDROID=$(curl --silent "https://api.github.com/repos/readdle/swift-android-toolchain/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/');
         wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-$SWIFT_ANDROID.zip;
@@ -33,8 +33,8 @@ jobs:
     - name: Start Android Emulator
       run: $ANDROID_HOME/emulator/emulator -no-window -avd ci-test -noaudio > /dev/null &
     - name: Run connected android tests
-      run: export TOOLCHAINS=org.swift.50320190830a;
-        export ANDROID_NDK_HOME=$(pwd)/android-ndk-r17c;
+      run: export TOOLCHAINS=org.swift.540202104261a;
+        export ANDROID_NDK_HOME=$(pwd)/android-ndk-r21e;
         export SWIFT_ANDROID_HOME=$(pwd)/swift-android-current;
         export PATH=$ANDROID_NDK_HOME:$PATH;
         export PATH=$SWIFT_ANDROID_HOME/bin:$SWIFT_ANDROID_HOME/build-tools/current:$PATH;

build.gradle

@@ -10,8 +10,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
-        classpath "com.readdle.android.swift:gradle:1.3.5"
+        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath "com.readdle.android.swift:gradle:1.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
         classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'

sample/build.gradle

@@ -55,9 +55,10 @@ dependencies {
     kapt project(':compiler')
     implementation project(':library')
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation "androidx.appcompat:appcompat:1.3.1"
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }