Skip to content

Commit 30dc28e

Browse files
tiensonqintiensonqin
authored
Merge pull request #14 from logseq/chore/release-prep
2 parents 03bcefb + 32e9066 commit 30dc28e

8 files changed

Lines changed: 141 additions & 40 deletions

File tree

‎.github/workflows/build-android.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# This is the main Android apk build workflow for both nightly and beta releases.
21
# This is also configured to run as a workflow_call.
32

43
name: Build-Android
@@ -43,7 +42,7 @@ on:
4342
env:
4443
CLOJURE_VERSION: '1.11.1.1413'
4544
NODE_VERSION: '22'
46-
JAVA_VERSION: '17'
45+
JAVA_VERSION: '21'
4746

4847
jobs:
4948
build-apk:

‎.github/workflows/build-desktop-release.yml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ jobs:
259259
mkdir -p builds
260260
# NOTE: save VERSION file to builds directory
261261
cp static/VERSION ./builds/VERSION
262-
mv static/out/make/*-*.AppImage ./builds/Logseq-linux-x64-${{ steps.ref.outputs.version }}.AppImage
263-
mv static/out/make/zip/linux/x64/*-linux-x64-*.zip ./builds/Logseq-linux-x64-${{ steps.ref.outputs.version }}.zip
262+
mv static/out/make/*-*.AppImage ./builds/Logseq-og-linux-x64-${{ steps.ref.outputs.version }}.AppImage
263+
mv static/out/make/zip/linux/x64/*-linux-x64-*.zip ./builds/Logseq-og-linux-x64-${{ steps.ref.outputs.version }}.zip
264264
265265
- name: Upload Artifact
266266
uses: actions/upload-artifact@v4
@@ -313,8 +313,8 @@ jobs:
313313
mkdir -p builds
314314
# NOTE: save VERSION file to builds directory
315315
cp static/VERSION ./builds/VERSION
316-
# mv static/out/make/*-*.AppImage ./builds/Logseq-linux-arm64-${{ steps.ref.outputs.version }}.AppImage
317-
mv static/out/make/zip/linux/arm64/*-linux-arm64-*.zip ./builds/Logseq-linux-arm64-${{ steps.ref.outputs.version }}.zip
316+
# mv static/out/make/*-*.AppImage ./builds/Logseq-og-linux-arm64-${{ steps.ref.outputs.version }}.AppImage
317+
mv static/out/make/zip/linux/arm64/*-linux-arm64-*.zip ./builds/Logseq-og-linux-arm64-${{ steps.ref.outputs.version }}.zip
318318
319319
- name: Upload Artifact
320320
uses: actions/upload-artifact@v4
@@ -365,7 +365,10 @@ jobs:
365365
- name: Save Artifact for Code Signing
366366
run: |
367367
mkdir builds
368-
mv static\out\make\squirrel.windows\x64\*.exe builds\Logseq-win-x64-${{ steps.ref.outputs.version }}.exe
368+
mv static\out\make\squirrel.windows\x64\*.nupkg builds\Logseq-og-win-x64-${{ steps.ref.outputs.version }}-full.nupkg
369+
mv static\out\make\zip\win32\x64\*.exe builds\Logseq-og-win-x64-${{ steps.ref.outputs.version }}.exe
370+
mv static\out\make\wix\x64\Logseq*.msi builds\Logseq-og-win-x64-${{ steps.ref.outputs.version }}.msi
371+
mv static\out\make\squirrel.windows\x64\RELEASES builds\RELEASES
369372
370373
- name: Sign
371374
uses: azure/trusted-signing-action@v0.5.9
@@ -462,8 +465,8 @@ jobs:
462465
- name: Save x64 artifacts
463466
run: |
464467
mkdir -p builds
465-
mv static/out/make/Logseq.dmg ./builds/Logseq-darwin-x64-${{ steps.ref.outputs.version }}.dmg
466-
mv static/out/make/zip/darwin/x64/*.zip ./builds/Logseq-darwin-x64-${{ steps.ref.outputs.version }}.zip
468+
mv static/out/make/Logseq*.dmg ./builds/Logseq-og-darwin-x64-${{ steps.ref.outputs.version }}.dmg
469+
mv static/out/make/zip/darwin/x64/*.zip ./builds/Logseq-og-darwin-x64-${{ steps.ref.outputs.version }}.zip
467470
468471
- name: Upload Artifact
469472
uses: actions/upload-artifact@v4
@@ -539,8 +542,8 @@ jobs:
539542
- name: Save arm64 artifacts
540543
run: |
541544
mkdir -p builds
542-
mv static/out/make/Logseq.dmg ./builds/Logseq-darwin-arm64-${{ steps.ref.outputs.version }}.dmg
543-
mv static/out/make/zip/darwin/arm64/*.zip ./builds/Logseq-darwin-arm64-${{ steps.ref.outputs.version }}.zip
545+
mv static/out/make/Logseq*.dmg ./builds/Logseq-og-darwin-arm64-${{ steps.ref.outputs.version }}.dmg
546+
mv static/out/make/zip/darwin/arm64/*.zip ./builds/Logseq-og-darwin-arm64-${{ steps.ref.outputs.version }}.zip
544547
545548
- name: Upload Artifact
546549
uses: actions/upload-artifact@v4
@@ -623,7 +626,7 @@ jobs:
623626
draft: false
624627
prerelease: ${{ (github.event_name == 'workflow_dispatch' && github.event.inputs.is-pre-release) || (github.event_name == 'schedule')}}
625628
body: |
626-
This is a nightly release of the Logseq desktop app.
629+
This is a nightly release of the Logseq OG desktop app.
627630
It's unstable compared to the official releases, **use it with caution**!
628631
files: |
629632
./SHA256SUMS.txt
@@ -688,7 +691,7 @@ jobs:
688691
689692
- name: Fix .nupkg name in RELEASES file
690693
run: |
691-
sed -i "s/Logseq-.*.nupkg/Logseq-win-x64-${{ steps.ref.outputs.version }}-full.nupkg/g" RELEASES
694+
sed -i "s/Logseq-.*.nupkg/Logseq-og-win-x64-${{ steps.ref.outputs.version }}-full.nupkg/g" RELEASES
692695
693696
- name: Generate SHA256 checksums
694697
run: |

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "com.logseq.app"
88
minSdkVersion rootProject.ext.minSdkVersion
99
targetSdkVersion rootProject.ext.targetSdkVersion
10-
versionCode 90
11-
versionName "0.10.15"
10+
versionCode 91
11+
versionName "1.0.0"
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
aaptOptions {
1414
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

‎ios/App/App.xcodeproj/project.pbxproj‎

Lines changed: 110 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -517,9 +517,13 @@
517517
DEVELOPMENT_TEAM = K378MFWK59;
518518
ENABLE_BITCODE = NO;
519519
INFOPLIST_FILE = App/Info.plist;
520-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
521-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
522-
MARKETING_VERSION = 0.10.15;
520+
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
521+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
522+
LD_RUNPATH_SEARCH_PATHS = (
523+
"$(inherited)",
524+
"@executable_path/Frameworks",
525+
);
526+
MARKETING_VERSION = 1.0.0;
523527
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
524528
PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq;
525529
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -544,9 +548,13 @@
544548
DEVELOPMENT_TEAM = K378MFWK59;
545549
ENABLE_BITCODE = NO;
546550
INFOPLIST_FILE = App/Info.plist;
547-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
548-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
549-
MARKETING_VERSION = 0.10.15;
551+
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
552+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
553+
LD_RUNPATH_SEARCH_PATHS = (
554+
"$(inherited)",
555+
"@executable_path/Frameworks",
556+
);
557+
MARKETING_VERSION = 1.0.0;
550558
PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq;
551559
PRODUCT_NAME = "$(TARGET_NAME)";
552560
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
@@ -569,9 +577,13 @@
569577
INFOPLIST_FILE = ShareViewController/Info.plist;
570578
INFOPLIST_KEY_CFBundleDisplayName = ShareViewController;
571579
INFOPLIST_KEY_NSHumanReadableCopyright = "";
572-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
573-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
574-
MARKETING_VERSION = 0.10.15;
580+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
581+
LD_RUNPATH_SEARCH_PATHS = (
582+
"$(inherited)",
583+
"@executable_path/Frameworks",
584+
"@executable_path/../../Frameworks",
585+
);
586+
MARKETING_VERSION = 1.0.0;
575587
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
576588
MTL_FAST_MATH = YES;
577589
PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController;
@@ -596,9 +608,13 @@
596608
INFOPLIST_FILE = ShareViewController/Info.plist;
597609
INFOPLIST_KEY_CFBundleDisplayName = ShareViewController;
598610
INFOPLIST_KEY_NSHumanReadableCopyright = "";
599-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
600-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
601-
MARKETING_VERSION = 0.10.15;
611+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
612+
LD_RUNPATH_SEARCH_PATHS = (
613+
"$(inherited)",
614+
"@executable_path/Frameworks",
615+
"@executable_path/../../Frameworks",
616+
);
617+
MARKETING_VERSION = 1.0.0;
602618
MTL_FAST_MATH = YES;
603619
PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController;
604620
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -609,6 +625,88 @@
609625
};
610626
name = Release;
611627
};
628+
D3490CD62E7CE9EB00E796A6 /* Debug */ = {
629+
isa = XCBuildConfiguration;
630+
buildSettings = {
631+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
632+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
633+
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
634+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
635+
CLANG_ENABLE_OBJC_WEAK = YES;
636+
CODE_SIGN_ENTITLEMENTS = shortcutsExtension.entitlements;
637+
CODE_SIGN_IDENTITY = "Apple Development";
638+
CODE_SIGN_STYLE = Automatic;
639+
CURRENT_PROJECT_VERSION = 1;
640+
DEVELOPMENT_TEAM = K378MFWK59;
641+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
642+
GCC_C_LANGUAGE_STANDARD = gnu17;
643+
GENERATE_INFOPLIST_FILE = YES;
644+
INFOPLIST_FILE = shortcuts/Info.plist;
645+
INFOPLIST_KEY_CFBundleDisplayName = shortcuts;
646+
INFOPLIST_KEY_NSHumanReadableCopyright = "";
647+
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
648+
LD_RUNPATH_SEARCH_PATHS = (
649+
"$(inherited)",
650+
"@executable_path/Frameworks",
651+
"@executable_path/../../Frameworks",
652+
);
653+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
654+
MARKETING_VERSION = 1.0.0;
655+
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
656+
MTL_FAST_MATH = YES;
657+
PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.shortcuts;
658+
PRODUCT_NAME = "$(TARGET_NAME)";
659+
SKIP_INSTALL = YES;
660+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
661+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
662+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
663+
SWIFT_EMIT_LOC_STRINGS = YES;
664+
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
665+
SWIFT_VERSION = 5.0;
666+
TARGETED_DEVICE_FAMILY = "1,2";
667+
};
668+
name = Debug;
669+
};
670+
D3490CD72E7CE9EB00E796A6 /* Release */ = {
671+
isa = XCBuildConfiguration;
672+
buildSettings = {
673+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
674+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
675+
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
676+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
677+
CLANG_ENABLE_OBJC_WEAK = YES;
678+
CODE_SIGN_ENTITLEMENTS = shortcutsExtension.entitlements;
679+
CODE_SIGN_IDENTITY = "Apple Development";
680+
CODE_SIGN_STYLE = Automatic;
681+
CURRENT_PROJECT_VERSION = 1;
682+
DEVELOPMENT_TEAM = K378MFWK59;
683+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
684+
GCC_C_LANGUAGE_STANDARD = gnu17;
685+
GENERATE_INFOPLIST_FILE = YES;
686+
INFOPLIST_FILE = shortcuts/Info.plist;
687+
INFOPLIST_KEY_CFBundleDisplayName = shortcuts;
688+
INFOPLIST_KEY_NSHumanReadableCopyright = "";
689+
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
690+
LD_RUNPATH_SEARCH_PATHS = (
691+
"$(inherited)",
692+
"@executable_path/Frameworks",
693+
"@executable_path/../../Frameworks",
694+
);
695+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
696+
MARKETING_VERSION = 1.0.0;
697+
MTL_FAST_MATH = YES;
698+
PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.shortcuts;
699+
PRODUCT_NAME = "$(TARGET_NAME)";
700+
SKIP_INSTALL = YES;
701+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
702+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
703+
SWIFT_EMIT_LOC_STRINGS = YES;
704+
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
705+
SWIFT_VERSION = 5.0;
706+
TARGETED_DEVICE_FAMILY = "1,2";
707+
};
708+
name = Release;
709+
};
612710
/* End XCBuildConfiguration section */
613711

614712
/* Begin XCConfigurationList section */

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "logseq",
3-
"version": "0.0.1",
2+
"name": "LogseqOG",
3+
"version": "1.0.0",
44
"private": true,
55
"main": "static/electron.js",
66
"devDependencies": {

‎resources/forge.config.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ const fs = require('fs')
33

44
module.exports = {
55
packagerConfig: {
6-
name: 'Logseq',
6+
name: 'LogseqOG',
77
icon: './icons/logseq_big_sur.icns',
8-
buildVersion: "90",
8+
buildVersion: "91",
9+
appBundleId: "com.logseq.logseq-og",
910
protocols: [
1011
{
1112
"protocol": "logseq",
@@ -31,7 +32,7 @@ module.exports = {
3132
{
3233
'name': '@electron-forge/maker-squirrel',
3334
'config': {
34-
'name': 'Logseq',
35+
'name': 'LogseqOG',
3536
'setupIcon': './icons/logseq.ico',
3637
'loadingGif': './icons/installing.gif',
3738
'certificateFile': process.env.CODE_SIGN_CERTIFICATE_FILE,
@@ -42,11 +43,11 @@ module.exports = {
4243
{
4344
'name': '@electron-forge/maker-wix',
4445
'config': {
45-
name: 'Logseq',
46+
name: 'LogseqOG',
4647
icon: path.join(__dirname, './icons/logseq.ico'),
4748
language: 1033,
4849
manufacturer: 'Logseq',
49-
appUserModelId: 'com.logseq.logseq',
50+
appUserModelId: 'com.logseq.logseq-og',
5051
upgradeCode: "3778eb84-a0ce-4109-9120-5d4315e0d7de",
5152
ui: {
5253
enabled: false,
@@ -75,7 +76,7 @@ module.exports = {
7576
config: {
7677
format: 'ULFO',
7778
icon: './icons/logseq_big_sur.icns',
78-
name: 'Logseq'
79+
name: 'LogseqOG'
7980
}
8081
},
8182
{
@@ -98,7 +99,7 @@ module.exports = {
9899
config: {
99100
repository: {
100101
owner: 'logseq',
101-
name: 'logseq'
102+
name: 'og'
102103
},
103104
prerelease: true
104105
}

‎resources/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "Logseq",
3-
"productName": "Logseq",
4-
"version": "0.10.15",
2+
"name": "LogseqOG",
3+
"productName": "Logseq OG",
4+
"version": "1.0.0",
55
"main": "electron.js",
66
"author": "Logseq",
77
"license": "AGPL-3.0",

‎scripts/get-pkg-version.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if (match) {
2121
if (process.argv[2] === 'nightly' || process.argv[2] === '') {
2222
const today = new Date()
2323
console.log(
24-
ver + '-alpha+nightly.' + today.toISOString().split('T')[0].replaceAll('-', '')
24+
ver + '-beta+nightly.' + today.toISOString().split('T')[0].replaceAll('-', '')
2525
)
2626
} else {
2727
console.log(ver)

0 commit comments

Comments
 (0)