Merge pull request #653 from Adamant-im/dev

Dev
Adamant-im · Sep 5, 2024 · 851df45 · 851df45
2 parents 832d196 + 50a89dd
commit 851df45
Show file tree

Hide file tree

Showing 221 changed files with 9,918 additions and 5,580 deletions.
diff --git a/.github/workflows/electron-linux.yml b/.github/workflows/electron-linux.yml
@@ -33,6 +33,6 @@ jobs:
       - name: Save artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: electron-release-app
+          name: linux-release-app
           path: |
             release-electron/*.AppImage
diff --git a/.github/workflows/electron-mac.yml b/.github/workflows/electron-mac.yml
@@ -39,9 +39,6 @@ jobs:
       - name: Save artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: electron-release-app
+          name: macos-release-app
           path: |
             release-electron/*.dmg
-            release-electron/*.blockmap
-            release-electron/*.yaml
-            release-electron/*.yml
diff --git a/.github/workflows/electron-windows.yml b/.github/workflows/electron-windows.yml
@@ -33,9 +33,6 @@ jobs:
       - name: Save artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: electron-release-app
+          name: windows-release-app
           path: |
             release-electron/*.exe
-            release-electron/*.blockmap
-            release-electron/*.yaml
-            release-electron/*.yml
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "im.adamant.adamantmessengerpwa"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 473
-        versionName "4.7.3"
+        versionCode 481
+        versionName "4.8.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/electron-builder.yml b/electron-builder.yml
@@ -36,6 +36,11 @@ mac:
   hardenedRuntime: true
   gatekeeperAssess: false
   notarize: false
+  target:
+    target: 'default'
+    arch: 
+      - x64
+      - arm64
 
 afterSign: 'scripts/electron/notarize.cjs'
 
@@ -51,7 +56,7 @@ dmg:
       path: '/Applications'
 
 # Linux configuration
-linux: 
+linux:
   category: 'InstantMessaging'
   desktop:
     Icon: './build/linux/icon.png'