Merge branch 'main' of github.com:lyrasoft/authman-app into main

simular · May 31, 2024 · bf4ca87 · bf4ca87
2 parents 70ba5ca + eab1069
commit bf4ca87
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "io.authman"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 2
-        versionName "1.0"
+        versionCode 3
+        versionName "1.0.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/electron-builder.config.json b/electron/electron-builder.config.json
@@ -21,12 +21,12 @@
   "win": {
     "target": "nsis",
     "icon": "assets/appIcon.png",
-    "artifactName": "${productName}.${ext}"
+    "artifactName": "${productName}-macOS.${ext}"
   },
   "mac": {
     "category": "your.app.category.type",
     "target": "dmg",
     "icon": "assets/appIcon.png",
-    "artifactName": "${productName}.${ext}"
+    "artifactName": "${productName}-Windows-Setup.${ext}"
   }
 }
diff --git a/electron/package.json b/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Authman",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "An Amazing Capacitor App",
   "author": {
     "name": "",
@@ -19,7 +19,7 @@
     "electron:start": "yarn build && electron --inspect=5858 ./",
     "electron:pack": "yarn build && electron-builder build --dir -c ./electron-builder.config.json",
     "electron:make": "yarn build && electron-builder build -c ./electron-builder.config.json -p always",
-    "pack:all": "yarn electron:pack --mac dmg; yarn electron:pack --win portable"
+    "pack:all": "yarn electron:pack --mac dmg; yarn electron:pack --win nsis"
   },
   "dependencies": {
     "@capacitor-community/electron": "^5.0.0",

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -346,14 +346,14 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = FZH47FZR8S;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Authman;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.1;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = io.authman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -369,14 +369,14 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = FZH47FZR8S;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Authman;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.authman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "authman-app",
   "private": true,
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite",