Skip to content

Commit 09489f8

Browse files
Bad3rBad3r
authored
Merge branch 'logseq:master' into master
2 parents aff0fee + 9043a5d commit 09489f8

File tree

6 files changed

+50
-50
lines changed

6 files changed

+50
-50
lines changed

‎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 86
11-
versionName "0.10.11"
10+
versionCode 87
11+
versionName "0.10.12"
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@
519519
INFOPLIST_FILE = App/Info.plist;
520520
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
521521
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
522-
MARKETING_VERSION = 0.10.11;
522+
MARKETING_VERSION = 0.10.12;
523523
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
524524
PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq;
525525
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -546,7 +546,7 @@
546546
INFOPLIST_FILE = App/Info.plist;
547547
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
548548
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
549-
MARKETING_VERSION = 0.10.11;
549+
MARKETING_VERSION = 0.10.12;
550550
PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq;
551551
PRODUCT_NAME = "$(TARGET_NAME)";
552552
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
@@ -571,7 +571,7 @@
571571
INFOPLIST_KEY_NSHumanReadableCopyright = "";
572572
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
573573
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
574-
MARKETING_VERSION = 0.10.11;
574+
MARKETING_VERSION = 0.10.12;
575575
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
576576
MTL_FAST_MATH = YES;
577577
PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController;
@@ -598,7 +598,7 @@
598598
INFOPLIST_KEY_NSHumanReadableCopyright = "";
599599
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
600600
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
601-
MARKETING_VERSION = 0.10.11;
601+
MARKETING_VERSION = 0.10.12;
602602
MTL_FAST_MATH = YES;
603603
PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController;
604604
PRODUCT_NAME = "$(TARGET_NAME)";

‎resources/forge.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = {
55
packagerConfig: {
66
name: 'Logseq',
77
icon: './icons/logseq_big_sur.icns',
8-
buildVersion: '86',
8+
buildVersion: "87",
99
protocols: [
1010
{
1111
"protocol": "logseq",

‎resources/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Logseq",
33
"productName": "Logseq",
4-
"version": "0.10.11",
4+
"version": "0.10.12",
55
"main": "electron.js",
66
"author": "Logseq",
77
"license": "AGPL-3.0",
@@ -22,7 +22,7 @@
2222
},
2323
"dependencies": {
2424
"@fastify/cors": "11.0.1",
25-
"@logseq/rsapi": "0.0.91",
25+
"@logseq/rsapi": "0.0.92",
2626
"@sentry/electron": "2.5.1",
2727
"abort-controller": "3.0.0",
2828
"better-sqlite3": "11.9.1",

‎src/main/frontend/version.cljs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
(ns ^:no-doc frontend.version)
22

3-
(defonce version "0.10.11")
3+
(defonce version "0.10.12")

‎static/yarn.lock‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -559,47 +559,47 @@
559559
dependencies:
560560
minipass "^7.0.4"
561561

562-
"@logseq/[email protected].91":
563-
version "0.0.91"
564-
resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-arm64/-/rsapi-darwin-arm64-0.0.91.tgz#e29cd37a372609b04d7dcfc7ae4c1405c7a54353"
565-
integrity sha512-t3xbU7qLeXSNZMmYioCPp7FY250Y2w6W/UaFrQKkyJ0Id2hCAomM9zKxGrTEFeN9Oo5sQtIw2RGiQOTxNX2tEw==
566-
567-
"@logseq/[email protected].91":
568-
version "0.0.91"
569-
resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-x64/-/rsapi-darwin-x64-0.0.91.tgz#926df44bb030aa3eacdf0cf1e9140ed44cdfad1e"
570-
integrity sha512-D8qknMzWEuCUKJfkSUKlp3HqQZ2OAhCVm2AnLp7cr/4gjznaiiuAe5/6I7arrI6FqVp2I2x5+hPsG/SXKimNSg==
571-
572-
"@logseq/[email protected].91":
573-
version "0.0.91"
574-
resolved "https://registry.yarnpkg.com/@logseq/rsapi-freebsd-x64/-/rsapi-freebsd-x64-0.0.91.tgz#48411e70ddf7e8abcc5d894281cb6191f295912b"
575-
integrity sha512-OLgaR3f+RiXMANK4+75cPDK0cqM/LMrOHalvJ4py2P9NoaxO+51whQ/5B4oR+mty9of4h37rNxZ+3oDvgOAFfA==
576-
577-
"@logseq/[email protected].91":
578-
version "0.0.91"
579-
resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-arm64-gnu/-/rsapi-linux-arm64-gnu-0.0.91.tgz#a7bcdf1db9060718e425b12cf59eaec56e0d0c77"
580-
integrity sha512-ZpSM/4/29BsM7VVYUXXpk8fyHv2rezhHpH2G3I36jW5bwTFklptmugaeOEhCgRvr70mduSHAPap8McN9NVwRew==
581-
582-
"@logseq/[email protected].91":
583-
version "0.0.91"
584-
resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-x64-gnu/-/rsapi-linux-x64-gnu-0.0.91.tgz#eef06a6b2020e3540e009aa80de08d7f568eb48c"
585-
integrity sha512-tDLSPQm86DHip3GABW7hAEGH3d0Fu4oiHe3c5tte2EP4y8YE7dKNccFgDYcCIqmiRdB/SxYS1lDCThDrvmGLqA==
586-
587-
"@logseq/[email protected].91":
588-
version "0.0.91"
589-
resolved "https://registry.yarnpkg.com/@logseq/rsapi-win32-x64-msvc/-/rsapi-win32-x64-msvc-0.0.91.tgz#b883cc9f1e8877e171b905b55f1cf962009eeb2f"
590-
integrity sha512-+9v4WjNZt2IxWFqxyEokT9TDP3WacvEo0XdxJ68qp6Enn5728yM/ptsTQApy3GVxFFrfiHigogOqVi6y/pJI9A==
591-
592-
"@logseq/[email protected].91":
593-
version "0.0.91"
594-
resolved "https://registry.yarnpkg.com/@logseq/rsapi/-/rsapi-0.0.91.tgz#542fd9119542d811bee71a0bb74df11f8d6227ae"
595-
integrity sha512-3YVnUw1ZbGwUmCXCwcJPAmys6M6wLsfEL3ibti3CupcmzWvi/wjejE9YnRYZ0RBUGNddtF0+PN6nDKBdLwTM4A==
562+
"@logseq/[email protected].92":
563+
version "0.0.92"
564+
resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-arm64/-/rsapi-darwin-arm64-0.0.92.tgz#8826d11c5e1e4a1540aeae10b3725bf1dd185d6c"
565+
integrity sha512-Fak9tz9TsGOzOkrm5wI9R0gnRsNTRpj5F2QwIPEC6XThKCYsrNUxMvmDzlL0TSTE1T6EEfxdYZUgd/spTs5zGA==
566+
567+
"@logseq/[email protected].92":
568+
version "0.0.92"
569+
resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-x64/-/rsapi-darwin-x64-0.0.92.tgz#645e7890783e20e8602668e97a92597e20d65d25"
570+
integrity sha512-AyxuRlNNNwAnnF2sojWJO978rwntJaK6owtDS3EJSN+LmKPn8sEcQ6l5ChMVIzjcZHAjFvc+FVuxTwOeEExJUQ==
571+
572+
"@logseq/[email protected].92":
573+
version "0.0.92"
574+
resolved "https://registry.yarnpkg.com/@logseq/rsapi-freebsd-x64/-/rsapi-freebsd-x64-0.0.92.tgz#49b36ab2e74e3243ae5c53f88f28ff752a048b30"
575+
integrity sha512-Bu2yXMCzYN4Kwv93/qnetOQ30zfHb5DwjSMvaApqMxTkg/b2b+VBJSm+KgB9fPP8gyYAp9jYHFEriGGRqm0V4Q==
576+
577+
"@logseq/[email protected].92":
578+
version "0.0.92"
579+
resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-arm64-gnu/-/rsapi-linux-arm64-gnu-0.0.92.tgz#b983c76f21b23579050b8c7cd53f27f09581dc9f"
580+
integrity sha512-DKeixTnCdNAaVd3w2b095OpHextsP0e12UR/wtR7l096PLE3o0GzOamQSWmVMYhyySlpdSfv4mZvvTtG7QEfdw==
581+
582+
"@logseq/[email protected].92":
583+
version "0.0.92"
584+
resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-x64-gnu/-/rsapi-linux-x64-gnu-0.0.92.tgz#8ebb3324c8681c1f44f6d6b6364dca18c9c5ee29"
585+
integrity sha512-FyvNgMB2EiHn3R22dhDsXw5p4BDc5dpKMbomu+6G4X9Bet6MzIxam3vToS/OelUwGErwbFjtdDswpBVrhe5WFg==
586+
587+
"@logseq/[email protected].92":
588+
version "0.0.92"
589+
resolved "https://registry.yarnpkg.com/@logseq/rsapi-win32-x64-msvc/-/rsapi-win32-x64-msvc-0.0.92.tgz#c3bb8e88c92da0a0289625da32d04c64c54668e7"
590+
integrity sha512-EWv+IfKo5f7QOSFkmousMJAaetpCZL08h+qTg73YhWPxenZALQr35qwWykbUASraERwjsxkTFimv86lXMu/GZw==
591+
592+
"@logseq/[email protected].92":
593+
version "0.0.92"
594+
resolved "https://registry.yarnpkg.com/@logseq/rsapi/-/rsapi-0.0.92.tgz#fac6834098a0280d923f0d68c71041b949d5a304"
595+
integrity sha512-HR6HN9Q2SlYegPD5yLd7S5LOyZVwwHhJAYwdx8AE9Rc+wwD+tLEHEbamG0ocTZdcbjl7YERnYOhd7eH9fUncfQ==
596596
optionalDependencies:
597-
"@logseq/rsapi-darwin-arm64" "0.0.91"
598-
"@logseq/rsapi-darwin-x64" "0.0.91"
599-
"@logseq/rsapi-freebsd-x64" "0.0.91"
600-
"@logseq/rsapi-linux-arm64-gnu" "0.0.91"
601-
"@logseq/rsapi-linux-x64-gnu" "0.0.91"
602-
"@logseq/rsapi-win32-x64-msvc" "0.0.91"
597+
"@logseq/rsapi-darwin-arm64" "0.0.92"
598+
"@logseq/rsapi-darwin-x64" "0.0.92"
599+
"@logseq/rsapi-freebsd-x64" "0.0.92"
600+
"@logseq/rsapi-linux-arm64-gnu" "0.0.92"
601+
"@logseq/rsapi-linux-x64-gnu" "0.0.92"
602+
"@logseq/rsapi-win32-x64-msvc" "0.0.92"
603603

604604
"@malept/cross-spawn-promise@^1.0.0", "@malept/cross-spawn-promise@^1.1.0":
605605
version "1.1.1"

0 commit comments

Comments
 (0)