diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 3a7261d1e5..2cece1488f 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -1,4 +1,3 @@ -# This is the main Android apk build workflow for both nightly and beta releases. # This is also configured to run as a workflow_call. name: Build-Android @@ -43,7 +42,7 @@ on: env: CLOJURE_VERSION: '1.11.1.1413' NODE_VERSION: '22' - JAVA_VERSION: '17' + JAVA_VERSION: '21' jobs: build-apk: diff --git a/.github/workflows/build-desktop-release.yml b/.github/workflows/build-desktop-release.yml index cf4588ae8c..35a3288ec2 100644 --- a/.github/workflows/build-desktop-release.yml +++ b/.github/workflows/build-desktop-release.yml @@ -259,8 +259,8 @@ jobs: mkdir -p builds # NOTE: save VERSION file to builds directory cp static/VERSION ./builds/VERSION - mv static/out/make/*-*.AppImage ./builds/Logseq-linux-x64-${{ steps.ref.outputs.version }}.AppImage - mv static/out/make/zip/linux/x64/*-linux-x64-*.zip ./builds/Logseq-linux-x64-${{ steps.ref.outputs.version }}.zip + mv static/out/make/*-*.AppImage ./builds/Logseq-og-linux-x64-${{ steps.ref.outputs.version }}.AppImage + mv static/out/make/zip/linux/x64/*-linux-x64-*.zip ./builds/Logseq-og-linux-x64-${{ steps.ref.outputs.version }}.zip - name: Upload Artifact uses: actions/upload-artifact@v4 @@ -313,8 +313,8 @@ jobs: mkdir -p builds # NOTE: save VERSION file to builds directory cp static/VERSION ./builds/VERSION - # mv static/out/make/*-*.AppImage ./builds/Logseq-linux-arm64-${{ steps.ref.outputs.version }}.AppImage - mv static/out/make/zip/linux/arm64/*-linux-arm64-*.zip ./builds/Logseq-linux-arm64-${{ steps.ref.outputs.version }}.zip + # mv static/out/make/*-*.AppImage ./builds/Logseq-og-linux-arm64-${{ steps.ref.outputs.version }}.AppImage + mv static/out/make/zip/linux/arm64/*-linux-arm64-*.zip ./builds/Logseq-og-linux-arm64-${{ steps.ref.outputs.version }}.zip - name: Upload Artifact uses: actions/upload-artifact@v4 @@ -365,7 +365,10 @@ jobs: - name: Save Artifact for Code Signing run: | mkdir builds - mv static\out\make\squirrel.windows\x64\*.exe builds\Logseq-win-x64-${{ steps.ref.outputs.version }}.exe + mv static\out\make\squirrel.windows\x64\*.nupkg builds\Logseq-og-win-x64-${{ steps.ref.outputs.version }}-full.nupkg + mv static\out\make\zip\win32\x64\*.exe builds\Logseq-og-win-x64-${{ steps.ref.outputs.version }}.exe + mv static\out\make\wix\x64\Logseq*.msi builds\Logseq-og-win-x64-${{ steps.ref.outputs.version }}.msi + mv static\out\make\squirrel.windows\x64\RELEASES builds\RELEASES - name: Sign uses: azure/trusted-signing-action@v0.5.9 @@ -462,8 +465,8 @@ jobs: - name: Save x64 artifacts run: | mkdir -p builds - mv static/out/make/Logseq.dmg ./builds/Logseq-darwin-x64-${{ steps.ref.outputs.version }}.dmg - mv static/out/make/zip/darwin/x64/*.zip ./builds/Logseq-darwin-x64-${{ steps.ref.outputs.version }}.zip + mv static/out/make/Logseq*.dmg ./builds/Logseq-og-darwin-x64-${{ steps.ref.outputs.version }}.dmg + mv static/out/make/zip/darwin/x64/*.zip ./builds/Logseq-og-darwin-x64-${{ steps.ref.outputs.version }}.zip - name: Upload Artifact uses: actions/upload-artifact@v4 @@ -539,8 +542,8 @@ jobs: - name: Save arm64 artifacts run: | mkdir -p builds - mv static/out/make/Logseq.dmg ./builds/Logseq-darwin-arm64-${{ steps.ref.outputs.version }}.dmg - mv static/out/make/zip/darwin/arm64/*.zip ./builds/Logseq-darwin-arm64-${{ steps.ref.outputs.version }}.zip + mv static/out/make/Logseq*.dmg ./builds/Logseq-og-darwin-arm64-${{ steps.ref.outputs.version }}.dmg + mv static/out/make/zip/darwin/arm64/*.zip ./builds/Logseq-og-darwin-arm64-${{ steps.ref.outputs.version }}.zip - name: Upload Artifact uses: actions/upload-artifact@v4 @@ -623,7 +626,7 @@ jobs: draft: false prerelease: ${{ (github.event_name == 'workflow_dispatch' && github.event.inputs.is-pre-release) || (github.event_name == 'schedule')}} body: | - This is a nightly release of the Logseq desktop app. + This is a nightly release of the Logseq OG desktop app. It's unstable compared to the official releases, **use it with caution**! files: | ./SHA256SUMS.txt @@ -688,7 +691,7 @@ jobs: - name: Fix .nupkg name in RELEASES file run: | - sed -i "s/Logseq-.*.nupkg/Logseq-win-x64-${{ steps.ref.outputs.version }}-full.nupkg/g" RELEASES + sed -i "s/Logseq-.*.nupkg/Logseq-og-win-x64-${{ steps.ref.outputs.version }}-full.nupkg/g" RELEASES - name: Generate SHA256 checksums run: | diff --git a/android/app/build.gradle b/android/app/build.gradle index 0245263637..1732157037 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.logseq.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 90 - versionName "0.10.15" + versionCode 91 + versionName "1.0.0" 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/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index fd85351c36..a92edbcbc4 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -517,9 +517,13 @@ DEVELOPMENT_TEAM = K378MFWK59; ENABLE_BITCODE = NO; INFOPLIST_FILE = App/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.10.15; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; + IPHONEOS_DEPLOYMENT_TARGET = 16.6; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0.0; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -544,9 +548,13 @@ DEVELOPMENT_TEAM = K378MFWK59; ENABLE_BITCODE = NO; INFOPLIST_FILE = App/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.10.15; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; + IPHONEOS_DEPLOYMENT_TARGET = 16.6; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; @@ -569,9 +577,13 @@ INFOPLIST_FILE = ShareViewController/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = ShareViewController; INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 0.10.15; + IPHONEOS_DEPLOYMENT_TARGET = 16.6; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MARKETING_VERSION = 1.0.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController; @@ -596,9 +608,13 @@ INFOPLIST_FILE = ShareViewController/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = ShareViewController; INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 0.10.15; + IPHONEOS_DEPLOYMENT_TARGET = 16.6; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MARKETING_VERSION = 1.0.0; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -609,6 +625,88 @@ }; name = Release; }; + D3490CD62E7CE9EB00E796A6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_ENTITLEMENTS = shortcutsExtension.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = K378MFWK59; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = shortcuts/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = shortcuts; + INFOPLIST_KEY_NSHumanReadableCopyright = ""; + IPHONEOS_DEPLOYMENT_TARGET = 26.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.shortcuts; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_APPROACHABLE_CONCURRENCY = YES; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + D3490CD72E7CE9EB00E796A6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_ENTITLEMENTS = shortcutsExtension.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = K378MFWK59; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = shortcuts/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = shortcuts; + INFOPLIST_KEY_NSHumanReadableCopyright = ""; + IPHONEOS_DEPLOYMENT_TARGET = 26.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0.0; + MTL_FAST_MATH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.shortcuts; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + STRING_CATALOG_GENERATE_SYMBOLS = YES; + SWIFT_APPROACHABLE_CONCURRENCY = YES; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ diff --git a/package.json b/package.json index 4b6572337f..493b449040 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "logseq", - "version": "0.0.1", + "name": "LogseqOG", + "version": "1.0.0", "private": true, "main": "static/electron.js", "devDependencies": { diff --git a/resources/forge.config.js b/resources/forge.config.js index 8c81280d37..a20b79cfbd 100644 --- a/resources/forge.config.js +++ b/resources/forge.config.js @@ -3,9 +3,10 @@ const fs = require('fs') module.exports = { packagerConfig: { - name: 'Logseq', + name: 'LogseqOG', icon: './icons/logseq_big_sur.icns', - buildVersion: "90", + buildVersion: "91", + appBundleId: "com.logseq.logseq-og", protocols: [ { "protocol": "logseq", @@ -31,7 +32,7 @@ module.exports = { { 'name': '@electron-forge/maker-squirrel', 'config': { - 'name': 'Logseq', + 'name': 'LogseqOG', 'setupIcon': './icons/logseq.ico', 'loadingGif': './icons/installing.gif', 'certificateFile': process.env.CODE_SIGN_CERTIFICATE_FILE, @@ -42,11 +43,11 @@ module.exports = { { 'name': '@electron-forge/maker-wix', 'config': { - name: 'Logseq', + name: 'LogseqOG', icon: path.join(__dirname, './icons/logseq.ico'), language: 1033, manufacturer: 'Logseq', - appUserModelId: 'com.logseq.logseq', + appUserModelId: 'com.logseq.logseq-og', upgradeCode: "3778eb84-a0ce-4109-9120-5d4315e0d7de", ui: { enabled: false, @@ -75,7 +76,7 @@ module.exports = { config: { format: 'ULFO', icon: './icons/logseq_big_sur.icns', - name: 'Logseq' + name: 'LogseqOG' } }, { @@ -98,7 +99,7 @@ module.exports = { config: { repository: { owner: 'logseq', - name: 'logseq' + name: 'og' }, prerelease: true } diff --git a/resources/package.json b/resources/package.json index de39ccc69e..c91f33fc54 100644 --- a/resources/package.json +++ b/resources/package.json @@ -1,7 +1,7 @@ { - "name": "Logseq", - "productName": "Logseq", - "version": "0.10.15", + "name": "LogseqOG", + "productName": "Logseq OG", + "version": "1.0.0", "main": "electron.js", "author": "Logseq", "license": "AGPL-3.0", diff --git a/scripts/get-pkg-version.js b/scripts/get-pkg-version.js index 495dcf4687..a5d6775978 100644 --- a/scripts/get-pkg-version.js +++ b/scripts/get-pkg-version.js @@ -21,7 +21,7 @@ if (match) { if (process.argv[2] === 'nightly' || process.argv[2] === '') { const today = new Date() console.log( - ver + '-alpha+nightly.' + today.toISOString().split('T')[0].replaceAll('-', '') + ver + '-beta+nightly.' + today.toISOString().split('T')[0].replaceAll('-', '') ) } else { console.log(ver)