Merge pull request #7324 from bisq-network/release/v1.9.18

Release/v1.9.18
bisq-network · Dec 23, 2024 · 3be9ede · 3be9ede
2 parents 3e526c7 + 6db1c9e
commit 3be9ede
Show file tree

Hide file tree

Showing 40 changed files with 11,061 additions and 11 deletions.
diff --git a/build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/PackagingPlugin.kt b/build-logic/packaging/src/main/kotlin/bisq/gradle/packaging/PackagingPlugin.kt
@@ -22,7 +22,7 @@ import javax.inject.Inject
 class PackagingPlugin @Inject constructor(private val javaToolchainService: JavaToolchainService) : Plugin<Project> {
 
     companion object {
-        const val APP_VERSION = "1.9.17"
+        const val APP_VERSION = "1.9.18"
         const val OUTPUT_DIR_PATH = "packaging/jpackage/packages"
     }
 

diff --git a/common/src/main/java/bisq/common/app/Version.java b/common/src/main/java/bisq/common/app/Version.java
@@ -36,7 +36,7 @@ public class Version {
     // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
     // Therefore all sub versions start again with 1
     // We use semantic versioning with major, minor and patch
-    public static final String VERSION = "1.9.17";
+    public static final String VERSION = "1.9.18";
 
     /**
      * Holds a list of the tagged resource files for optimizing the getData requests.
@@ -45,7 +45,7 @@ public class Version {
      */
     public static final List<String> HISTORICAL_RESOURCE_FILE_VERSION_TAGS = Arrays.asList("1.4.0", "1.5.0", "1.5.2",
             "1.5.5", "1.5.7", "1.6.0", "1.6.3", "1.6.5", "1.7.2", "1.7.4", "1.8.0", "1.8.1", "1.8.3", "1.9.0", "1.9.3",
-            "1.9.5", "1.9.6", "1.9.7", "1.9.10", "1.9.11", "1.9.13", "1.9.15", "1.9.16");
+            "1.9.5", "1.9.6", "1.9.7", "1.9.10", "1.9.11", "1.9.13", "1.9.15", "1.9.16", "1.9.18");
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);

diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist
@@ -5,10 +5,10 @@
         <!-- See: https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -->
 
         <key>CFBundleVersion</key>
-        <string>1.9.17</string>
+        <string>1.9.18</string>
 
         <key>CFBundleShortVersionString</key>
-        <string>1.9.17</string>
+        <string>1.9.18</string>
 
         <key>CFBundleExecutable</key>
         <string>Bisq</string>

diff --git a/desktop/package/macosx/copy_dbs.sh b/desktop/package/macosx/copy_dbs.sh
@@ -2,7 +2,7 @@
 
 cd $(dirname $0)/../../../
 
-version="1.9.17"
+version="1.9.18"
 
 # Set BISQ_DIR as environment var to the path of your locally synced Bisq data directory e.g. BISQ_DIR=~/Library/Application\ Support/Bisq
 

diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh
@@ -2,7 +2,7 @@
 
 cd ../../
 
-version="1.9.17-SNAPSHOT"
+version="1.9.18-SNAPSHOT"
 
 target_dir="releases/$version"
 

diff --git a/desktop/package/macosx/insert_snapshot_version.sh b/desktop/package/macosx/insert_snapshot_version.sh
@@ -2,7 +2,7 @@
 
 cd $(dirname $0)/../../../
 
-version=1.9.17
+version=1.9.18
 
 find . -type f \( -name "finalize.sh" \
 -o -name "create_app.sh" \

diff --git a/desktop/package/macosx/replace_version_number.sh b/desktop/package/macosx/replace_version_number.sh
@@ -2,8 +2,8 @@
 
 cd $(dirname $0)/../../../.
 
-oldVersion=1.9.16
-newVersion=1.9.17
+oldVersion=1.9.17
+newVersion=1.9.18
 
 find . -type f \( -name "finalize.sh" \
 -o -name "create_app.sh" \

diff --git a/desktop/src/main/resources/version.txt b/desktop/src/main/resources/version.txt
@@ -1 +1 @@
-1.9.17-SNAPSHOT
+1.9.18-SNAPSHOT
diff --git a/p2p/src/main/resources/AccountAgeWitnessStore_1.9.18_BTC_MAINNET b/p2p/src/main/resources/AccountAgeWitnessStore_1.9.18_BTC_MAINNET
diff --git a/p2p/src/main/resources/BlindVoteStore_BTC_MAINNET b/p2p/src/main/resources/BlindVoteStore_BTC_MAINNET
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_846001-847000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_846001-847000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_847001-848000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_847001-848000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_848001-849000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_848001-849000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_849001-850000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_849001-850000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_850001-851000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_850001-851000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_851001-852000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_851001-852000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_852001-853000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_852001-853000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_853001-854000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_853001-854000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_854001-855000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_854001-855000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_855001-856000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_855001-856000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_856001-857000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_856001-857000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_857001-858000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_857001-858000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_858001-859000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_858001-859000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_859001-860000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_859001-860000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_860001-861000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_860001-861000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_861001-862000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_861001-862000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_862001-863000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_862001-863000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_863001-864000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_863001-864000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_864001-865000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_864001-865000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_865001-866000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_865001-866000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_866001-867000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_866001-867000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_867001-868000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_867001-868000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_868001-869000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_868001-869000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_869001-870000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_869001-870000
diff --git a/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_870001-871000 b/p2p/src/main/resources/BsqBlocks_BTC_MAINNET/BsqBlocks_870001-871000
diff --git a/p2p/src/main/resources/DaoStateStore_BTC_MAINNET b/p2p/src/main/resources/DaoStateStore_BTC_MAINNET
diff --git a/p2p/src/main/resources/ProposalStore_BTC_MAINNET b/p2p/src/main/resources/ProposalStore_BTC_MAINNET
diff --git a/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET b/p2p/src/main/resources/SignedWitnessStore_BTC_MAINNET
diff --git a/p2p/src/main/resources/TempProposalStore_BTC_MAINNET b/p2p/src/main/resources/TempProposalStore_BTC_MAINNET
diff --git a/p2p/src/main/resources/TradeStatistics3Store_1.9.18_BTC_MAINNET b/p2p/src/main/resources/TradeStatistics3Store_1.9.18_BTC_MAINNET