Tweak workflows

droibit · Jul 20, 2024 · 757388d · 757388d
1 parent 96a5a2d
commit 757388d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/android_implementation_package.yml b/.github/workflows/android_implementation_package.yml
@@ -41,9 +41,9 @@ jobs:
     - name: Run Flutter unit tests
       run: flutter test
       working-directory: ./flutter_custom_tabs_android
-    - name: Run Android unit tests
-      run: ./gradlew :flutter_custom_tabs_android:testDebugUnitTest
-      working-directory: ./flutter_custom_tabs_android/example
     - name: Build example android app
       run: flutter build apk --release
-      working-directory: ./flutter_custom_tabs_android/example
+      working-directory: ./flutter_custom_tabs_android/example
+    - name: Run Android unit tests
+      run: ./gradlew :flutter_custom_tabs_android:testDebugUnitTest
+      working-directory: ./flutter_custom_tabs_android/example/android
diff --git a/.github/workflows/ios_implementation_package.yml b/.github/workflows/ios_implementation_package.yml
@@ -15,6 +15,8 @@ on:
       - 'flutter_custom_tabs_ios/**'
       - '.github/workflows/ios_implementation_package.yml'
       - '!**.md'
+env:
+  DEVELOPER_DIR: /Applications/Xcode_15.4.app
 
 jobs:
   build:

diff --git a/flutter_custom_tabs_ios/example/ios/Podfile b/flutter_custom_tabs_ios/example/ios/Podfile
@@ -41,5 +41,12 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+
+    target.build_configurations.each do |config|
+      pod_ios_deployment_target = Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
+      if pod_ios_deployment_target < Gem::Version.new('12.0')
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
+      end
+    end
   end
 end
diff --git a/flutter_custom_tabs_ios/example/ios/Podfile.lock b/flutter_custom_tabs_ios/example/ios/Podfile.lock
@@ -23,6 +23,6 @@ SPEC CHECKSUMS:
   flutter_custom_tabs_ios: a651b18786388923b62de8c0537607de87c2eccf
   integration_test: 13825b8a9334a850581300559b8839134b124670
 
-PODFILE CHECKSUM: 503b9a445cf73afeaacc1a6a56c1ff9c4b7f1238
+PODFILE CHECKSUM: 2f40fced8ccaa4f568954e339e48cea7e274cbdb
 
 COCOAPODS: 1.15.2
diff --git a/flutter_custom_tabs_ios/example/ios/Runner.xcodeproj/project.pbxproj b/flutter_custom_tabs_ios/example/ios/Runner.xcodeproj/project.pbxproj
@@ -669,7 +669,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
 				MARKETING_VERSION = 1.0;
@@ -705,7 +705,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
 				MARKETING_VERSION = 1.0;
@@ -738,7 +738,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
 				MARKETING_VERSION = 1.0;