fix: compile and CI

timbru31 · Dec 7, 2021 · 9e0a4cc · 9e0a4cc
1 parent ca8816e
commit 9e0a4cc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/smoke-test-macos.yml b/.github/workflows/smoke-test-macos.yml
@@ -38,7 +38,6 @@ jobs:
           gsed -i '4i\    <preference name="SwiftVersion" value="5" />' config.xml
           cordova platform add android@latest
           gsed -i '4i\    <preference name="GradlePluginKotlinEnabled" value="true" />' config.xml
-          gsed -i '4i\    <preference name="AndroidXEnabled" value="true" />' config.xml
 
       - name: Install Plugins
         run: |

diff --git a/.github/workflows/smoke-test-ubuntu-ionic.yml b/.github/workflows/smoke-test-ubuntu-ionic.yml
@@ -31,13 +31,12 @@ jobs:
           npm i -g cordova @ionic/cli
           ionic start lottie-smoke-test tabs --cordova --type angular --no-interactive --no-confirm
           cd lottie-smoke-test
-          ionic cordova platform add android@9.1.0 --no-interactive --confirm
+          ionic cordova platform add android@latest --no-interactive --confirm
+          sed -i '4i\    <preference name="GradlePluginKotlinEnabled" value="true" />' config.xml
 
       - name: Install Plugins
         run: |
           cd lottie-smoke-test
-          ionic cordova plugin add cordova-plugin-androidx --no-interactive --confirm
-          ionic cordova plugin add cordova-plugin-androidx-adapter --no-interactive --confirm
           ionic cordova plugin add $GITHUB_WORKSPACE --no-interactive --confirm -- --link
 
       - name: Build Project

diff --git a/.github/workflows/smoke-test-ubuntu.yml b/.github/workflows/smoke-test-ubuntu.yml
@@ -33,7 +33,6 @@ jobs:
           cd lottie-smoke-test
           cordova platform add android@latest
           sed -i '4i\    <preference name="GradlePluginKotlinEnabled" value="true" />' config.xml
-          sed -i '4i\    <preference name="AndroidXEnabled" value="true" />' config.xml
 
       - name: Install Plugins
         run: |

diff --git a/.github/workflows/smoke-test-windows.yml b/.github/workflows/smoke-test-windows.yml
@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/setup-node@v2.5.0
         with:
-          node-version: '16.x'
+          node-version: '12.x'
 
       - name: Environment Information
         run: |
@@ -35,8 +35,6 @@ jobs:
       - name: Install Plugins
         run: |
           cd lottie-smoke-test
-          cordova plugin add cordova-plugin-androidx
-          cordova plugin add cordova-plugin-androidx-adapter
           cordova plugin add $env:GITHUB_WORKSPACE --link
 
       - name: Build Project

diff --git a/src/ios/LottieSplashScreen.swift b/src/ios/LottieSplashScreen.swift
@@ -268,7 +268,7 @@ import Lottie
         )
     }
 
-    private func getUIModeDependentPreference(basePreferenceName: String, defaultValue: String? = "") -> String {
+    private func getUIModeDependentPreference(basePreferenceName: String, defaultValue: String = "") -> String {
         var preferenceValue = ""
         if #available(iOS 12.0, *) {
             if viewController.traitCollection.userInterfaceStyle == .dark {