From f9834d95c61574cff7b6fa800ea2adeb8740815c Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Mon, 19 May 2025 22:43:15 +0800 Subject: [PATCH 1/3] chore: bump to 0.10.11 --- android/app/build.gradle | 4 ++-- ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- resources/forge.config.js | 2 +- resources/package.json | 2 +- src/main/frontend/version.cljs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 062d33cc77..d587b026b9 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 84 - versionName "0.10.10" + versionCode 86 + versionName "0.10.11" 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 cfb09e7685..28593eb283 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -519,7 +519,7 @@ INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.10.10; + MARKETING_VERSION = 0.10.11; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -546,7 +546,7 @@ INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.10.10; + MARKETING_VERSION = 0.10.11; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; @@ -571,7 +571,7 @@ INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 0.10.10; + MARKETING_VERSION = 0.10.11; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController; @@ -598,7 +598,7 @@ INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 0.10.10; + MARKETING_VERSION = 0.10.11; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/resources/forge.config.js b/resources/forge.config.js index 702107c6f9..c9a1fff1ef 100644 --- a/resources/forge.config.js +++ b/resources/forge.config.js @@ -5,7 +5,7 @@ module.exports = { packagerConfig: { name: 'Logseq', icon: './icons/logseq_big_sur.icns', - buildVersion: "85", + buildVersion: 86, protocols: [ { "protocol": "logseq", diff --git a/resources/package.json b/resources/package.json index 1ece7047d8..d19fd3788c 100644 --- a/resources/package.json +++ b/resources/package.json @@ -1,7 +1,7 @@ { "name": "Logseq", "productName": "Logseq", - "version": "0.10.10", + "version": "0.10.11", "main": "electron.js", "author": "Logseq", "license": "AGPL-3.0", diff --git a/src/main/frontend/version.cljs b/src/main/frontend/version.cljs index ad6cde7f3b..0c8ca61941 100644 --- a/src/main/frontend/version.cljs +++ b/src/main/frontend/version.cljs @@ -1,3 +1,3 @@ (ns ^:no-doc frontend.version) -(defonce version "0.10.10") +(defonce version "0.10.11") From c22f8693ccabae2589a14ef674aebe99d4742470 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Mon, 19 May 2025 23:40:55 +0800 Subject: [PATCH 2/3] fix: buildVersion should be a string --- resources/forge.config.js | 2 +- scripts/bump-version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/forge.config.js b/resources/forge.config.js index c9a1fff1ef..aa91c34ea4 100644 --- a/resources/forge.config.js +++ b/resources/forge.config.js @@ -5,7 +5,7 @@ module.exports = { packagerConfig: { name: 'Logseq', icon: './icons/logseq_big_sur.icns', - buildVersion: 86, + buildVersion: '86', protocols: [ { "protocol": "logseq", diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index cbb6581b3c..801807f58d 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -58,7 +58,7 @@ $SED -i 's/defonce version ".*"/defonce version "'${NEW_VERSION}'"/g' src/main/f $SED -i 's/"version": ".*"/"version": "'${NEW_VERSION}'"/g' resources/package.json $SED -i 's/versionName ".*"/versionName "'${NEW_VERSION}'"/g' android/app/build.gradle $SED -i 's/versionCode .*/versionCode '${NEW_VERSION_CODE}'/g' android/app/build.gradle -$SED -i 's/buildVersion: .*/buildVersion: '${NEW_VERSION_CODE}',/g' resources/forge.config.js +$SED -i 's/buildVersion: .*/buildVersion: "'${NEW_VERSION_CODE}'",/g' resources/forge.config.js $SED -i 's/MARKETING_VERSION = .*;/MARKETING_VERSION = '${NEW_VERSION}';/g' ios/App/App.xcodeproj/project.pbxproj git --no-pager diff -U0 From fa869a4c774740c73a48e81828e89e643ff76f00 Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Mon, 19 May 2025 15:28:21 -0400 Subject: [PATCH 3/3] chore: temporarily disable nightly build to allow testing of 0.10.11-rc1 --- .github/workflows/build-desktop-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-desktop-release.yml b/.github/workflows/build-desktop-release.yml index 3aa4cabd9f..5505da9dfa 100644 --- a/.github/workflows/build-desktop-release.yml +++ b/.github/workflows/build-desktop-release.yml @@ -43,8 +43,8 @@ on: type: boolean required: true default: true - schedule: # Every workday at the 2 P.M. (UTC) we run a scheduled nightly build - - cron: '0 14 * * MON-FRI' + # schedule: # Every workday at the 2 P.M. (UTC) we run a scheduled nightly build + # - cron: '0 14 * * MON-FRI' env: CLOJURE_VERSION: '1.11.1.1413'