Koniverse · Quangdm-cdm · Nov 28, 2024 · Nov 28, 2024 · Nov 28, 2024 · Nov 28, 2024
diff --git a/.github/workflows/build-internal.yml b/.github/workflows/build-internal.yml
@@ -8,7 +8,7 @@ jobs:
   # iOS build workflow -------------------------------------------------
   build-ios:
     name: iOS builds
-    runs-on: macos-13
+    runs-on: macos-15
     env:
       GH_PAT: ${{ secrets.GH_PAT }}
       GH_RELEASE_GITHUB_API_TOKEN: ${{ secrets.GH_PAT }}
@@ -82,18 +82,22 @@ jobs:
     - name: Install Pods
       run: cd ios && pod update hermes-engine --no-repo-update && cd ..
 
+    - name: Select Xcode version
+      run: sudo xcode-select -s '/Applications/Xcode_16.1.app'
+
     # Build IPA file
     - name: iOS Build Action
       uses: yukiarrr/[email protected]
       with:
-        project-path: ios/SubWalletMobile.xcodeproj
-        export-method: 'ad-hoc'
+        project-path: ./ios/SubWalletMobile.xcodeproj
         p12-base64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
-        certificate-password: ${{ secrets.P12_PASSWORD }}
         mobileprovision-base64: ${{ secrets.BUILD_ADHOC_PROVISION_PROFILE_BASE64 }}
         code-signing-identity: 'Apple Distribution: CDM SOFTWARE DEVELOPMENT COMPANY LIMITED (ZUZ7T3GQMT)'
         team-id: ${{ secrets.APPLE_TEAM_ID }}
-        workspace-path: ios/SubWalletMobile.xcworkspace
+        workspace-path: ./ios/SubWalletMobile.xcworkspace
+        export-method: 'ad-hoc'
+        configuration: Debug
+        certificate-password: ${{ secrets.P12_PASSWORD }}
         scheme: SubWalletMobile-Production
 
     - name: Upload iOS to Diawi
@@ -121,7 +125,7 @@ jobs:
   # Android build workflow -------------------------------------------------
   build-android:
     name: Android builds
-    runs-on: macos-12
+    runs-on: macos-latest
     env:
       GH_PAT: ${{ secrets.GH_PAT }}
       GH_RELEASE_GITHUB_API_TOKEN: ${{ secrets.GH_PAT }}

diff --git a/android/build.gradle b/android/build.gradle
@@ -2,9 +2,8 @@
 
 buildscript {
     ext {
-        kotlinVersion = "1.6.21"
         buildToolsVersion = "33.0.0"
-        minSdkVersion = 21
+        minSdkVersion = 24
         compileSdkVersion = 34
         targetSdkVersion = 34
         androidXBrowser = "1.4.0"

diff --git a/html/DevModeWeb.bundle/site/index.html b/html/DevModeWeb.bundle/site/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-e4c46eeab95bcb58e4bc.js"></script></head><body><div id="root">SubWallet</div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-aaa08d2d8bcf5130014a.js"></script></head><body><div id="root">SubWallet</div></body></html>
diff --git a/...e/site/web-runner-30f88faa818db4af0bb4.js → ...e/site/web-runner-aaa08d2d8bcf5130014a.js b/...e/site/web-runner-30f88faa818db4af0bb4.js → ...e/site/web-runner-aaa08d2d8bcf5130014a.js
diff --git a/html/Web.bundle/site/index.html b/html/Web.bundle/site/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-30f88faa818db4af0bb4.js"></script></head><body><div id="root">SubWallet</div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-e79cca6d68471c8a6674.js"></script></head><body><div id="root">SubWallet</div></body></html>
diff --git a/...e/site/web-runner-e4c46eeab95bcb58e4bc.js → ...e/site/web-runner-e79cca6d68471c8a6674.js b/...e/site/web-runner-e4c46eeab95bcb58e4bc.js → ...e/site/web-runner-e79cca6d68471c8a6674.js
diff --git a/ios/Podfile b/ios/Podfile
@@ -81,6 +81,14 @@ target 'SubWalletMobile' do
       end
     end
 
+    installer.pods_project.targets.each do |target|
+      if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+        target.build_configurations.each do |config|
+          config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+        end
+      end
+    end
+
     # Fix bundle targets' 'Signing Certificate' to 'Sign to Run Locally'
     installer.pods_project.targets.each do |target|
         if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"

diff --git a/ios/SubWalletMobile.xcodeproj/project.pbxproj b/ios/SubWalletMobile.xcodeproj/project.pbxproj
@@ -551,8 +551,12 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = SubWalletMobile/SubWalletMobile.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 440;
-				DEVELOPMENT_TEAM = ZUZ7T3GQMT;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZUZ7T3GQMT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = SubWalletMobile/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SubWallet;
@@ -570,6 +574,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = app.subwallet.mobile;
 				PRODUCT_NAME = SubWalletMobile;
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "SubWallet Adhoc Provisioning Profile";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -584,8 +590,12 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = SubWalletMobile/SubWalletMobile.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 440;
-				DEVELOPMENT_TEAM = ZUZ7T3GQMT;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = ZUZ7T3GQMT;
 				INFOPLIST_FILE = SubWalletMobile/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = SubWallet;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
@@ -602,6 +612,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = app.subwallet.mobile;
 				PRODUCT_NAME = SubWalletMobile;
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "SubWallet Adhoc Provisioning Profile";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";