From 0dcc28711a68b4c227d67cec039544ec8da8605a Mon Sep 17 00:00:00 2001 From: Simon Asika Date: Fri, 31 May 2024 12:28:12 +0800 Subject: [PATCH 1/4] rm vscode --- .vscode/extensions.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index ffcebbe..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "recommendations": [ - "ionic.ionic" - ] -} From 73e3375762ff24a3ca98a2fc075ac2ef4ec918c4 Mon Sep 17 00:00:00 2001 From: Simon Asika Date: Fri, 31 May 2024 12:32:24 +0800 Subject: [PATCH 2/4] Release 1.0.1 --- android/app/build.gradle | 4 ++-- electron/package.json | 2 +- ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- package.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index cb5bc22..471a7ae 100644 --- 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/package.json b/electron/package.json index f603179..68e625d 100644 --- 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": "", diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 1832c41..47032bd 100644 --- 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 index 9ba94c5..bbfb4c8 100644 --- 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", From 606c4720ae6710a16af668a6a2a793dc44f72895 Mon Sep 17 00:00:00 2001 From: Simon Asika Date: Fri, 31 May 2024 12:47:28 +0800 Subject: [PATCH 3/4] Electron build --- electron/electron-builder.config.json | 6 ++---- electron/package.json | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/electron/electron-builder.config.json b/electron/electron-builder.config.json index f43d248..060ba8f 100644 --- a/electron/electron-builder.config.json +++ b/electron/electron-builder.config.json @@ -20,13 +20,11 @@ }, "win": { "target": "nsis", - "icon": "assets/appIcon.png", - "artifactName": "${productName}.${ext}" + "icon": "assets/appIcon.png" }, "mac": { "category": "your.app.category.type", "target": "dmg", - "icon": "assets/appIcon.png", - "artifactName": "${productName}.${ext}" + "icon": "assets/appIcon.png" } } diff --git a/electron/package.json b/electron/package.json index 68e625d..0794e84 100644 --- a/electron/package.json +++ b/electron/package.json @@ -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" }, "dependencies": { "@capacitor-community/electron": "^5.0.0", From eab106953e28f6d9f9a401c7ecdf22820d776a49 Mon Sep 17 00:00:00 2001 From: Simon Asika Date: Fri, 31 May 2024 13:09:26 +0800 Subject: [PATCH 4/4] electron pack name --- electron/electron-builder.config.json | 6 ++++-- electron/package.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/electron/electron-builder.config.json b/electron/electron-builder.config.json index 060ba8f..523ee5a 100644 --- a/electron/electron-builder.config.json +++ b/electron/electron-builder.config.json @@ -20,11 +20,13 @@ }, "win": { "target": "nsis", - "icon": "assets/appIcon.png" + "icon": "assets/appIcon.png", + "artifactName": "${productName}-macOS.${ext}" }, "mac": { "category": "your.app.category.type", "target": "dmg", - "icon": "assets/appIcon.png" + "icon": "assets/appIcon.png", + "artifactName": "${productName}-Windows-Setup.${ext}" } } diff --git a/electron/package.json b/electron/package.json index 0794e84..8c73bef 100644 --- a/electron/package.json +++ b/electron/package.json @@ -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" + "pack:all": "yarn electron:pack --mac dmg; yarn electron:pack --win nsis" }, "dependencies": { "@capacitor-community/electron": "^5.0.0",