[UPDATE] Merge 'develop' into 'feature/new-page'

ilyalehchylin · Jun 6, 2024 · 59fcef9 · 59fcef9
2 parents 697a713 + c9ee8ca
commit 59fcef9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,12 +35,17 @@ jobs:
           os: macos
 
   build:
-    runs-on: macos-latest
+    runs-on: macos-13
     needs: test
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3.5.2
+
+      - name: Setup Xamarin
+        run: |
+          brew install --cask xamarin-ios
+          brew install --cask xamarin-android
         
       - name: NuGet Cache
         uses: actions/cache@v3.3.1

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -67,12 +67,17 @@ jobs:
           value: ${{ env.APP_BUILD_NUMBER_INCREMENTED }}
 
   build_apk:
-    runs-on: macos-latest
+    runs-on: macos-13
     environment: github-actions-release
     needs: prepare_build
     steps:
       - name: Checkout
         uses: actions/checkout@v3.5.2
+
+      - name: Setup Xamarin
+        run: |
+          brew install --cask xamarin-ios
+          brew install --cask xamarin-android
         
       - name: NuGet Cache
         uses: actions/cache@v3.3.1
@@ -119,12 +124,17 @@ jobs:
           path: ${{ env.ARTIFACTS_DIRECTORY }}/by.bntu.educats_${{ needs.prepare_build.outputs.app_version }}.${{ needs.prepare_build.outputs.incremented_build_number }}.apk
 
   build_aab:
-    runs-on: macos-latest
+    runs-on: macos-13
     environment: github-actions-release
     needs: prepare_build
     steps:
       - name: Checkout
         uses: actions/checkout@v3.5.2
+
+      - name: Setup Xamarin
+        run: |
+          brew install --cask xamarin-ios
+          brew install --cask xamarin-android
         
       - name: NuGet Cache
         uses: actions/cache@v3.3.1
@@ -171,12 +181,17 @@ jobs:
           path: ${{ env.ARTIFACTS_DIRECTORY }}/by.bntu.educats_${{ needs.prepare_build.outputs.app_version }}.${{ needs.prepare_build.outputs.incremented_build_number }}.aab
 
   build_ipa:
-    runs-on: macos-latest
+    runs-on: macos-13
     environment: github-actions-release
     needs: prepare_build
     steps:
       - name: Checkout
         uses: actions/checkout@v3.5.2
+
+      - name: Setup Xamarin
+        run: |
+          brew install --cask xamarin-ios
+          brew install --cask xamarin-android
         
       - name: NuGet Cache
         uses: actions/cache@v3.3.1

diff --git a/source/EduCATS.Android/Properties/AndroidManifest.xml b/source/EduCATS.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="by.bntu.educats" android:versionName="2.0.1" android:versionCode="1">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
+	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

diff --git a/source/EduCATS.iOS/EduCATS.iOS.csproj b/source/EduCATS.iOS/EduCATS.iOS.csproj
@@ -72,7 +72,7 @@
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <CodesignKey>iPhone Distribution</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchExtraArgs>--optimize=experimental-xforms-product-type</MtouchExtraArgs>

diff --git a/source/EduCATS.iOS/packages.lock.json b/source/EduCATS.iOS/packages.lock.json
@@ -293,18 +293,6 @@
         "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A=="
       }
     },
-    "Xamarin.iOS,Version=v1.0/win-arm64": {
-      "SkiaSharp.NativeAssets.iOS": {
-        "type": "Transitive",
-        "resolved": "2.88.6",
-        "contentHash": "j+Nv2cKDb6YZDebtIWjaypG7rngEw7xLvB0WlCoIpUShop0jPLutoqiPx2r4FFt72egzVhUrUn/rlyL7EeYpTA=="
-      },
-      "System.Security.Cryptography.Cng": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "WG3r7EyjUe9CMPFSs6bty5doUqT+q9pbI80hlNzo2SkPkZ4VTuZkGWjpp77JB8+uaL4DFPRdBsAY+DX3dBK92A=="
-      }
-    },
     "Xamarin.iOS,Version=v1.0/win-x64": {
       "SkiaSharp.NativeAssets.iOS": {
         "type": "Transitive",