Version 1.23.0 and changelog

kbinani · Oct 1, 2023 · 23b03a2 · 23b03a2
1 parent f22653d
commit 23b03a2
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 68 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,9 @@
-Version 1.22.0 (TBD)
+Version 1.23.0 (TBD)
+・Added support for Minecraft version 1.20.2.
+・Improved the accuracy of item conversion when converting to Bedrock. [j2b, x2b]
+・Fixed an issue where some map items could not be converted and would disappear when converting from Bedrock to Java. [b2j]
+
+Version 1.22.0 (4 Sep 2023)
 ・Improved the conversion accuracy of blocks and block entities when converting to the Bedrock version. [j2b, x2b]
 
 Version 1.21.0 (22 Aug 2023)

diff --git a/CHANGELOG.ja-JP b/CHANGELOG.ja-JP
@@ -1,4 +1,9 @@
-バージョン 1.22.0 (TBD)
+バージョン 1.23.0 (TBD)
+・Minecraft 1.20.2 に対応しました。
+・統合版への変換でアイテムの変換精度を改善しました。[j2b, x2b]
+・統合版からJava版への変換で、一部の地図アイテムが変換できず消えてしまう問題を修正しました。[b2j]
+
+バージョン 1.22.0 (2023/9/4)
 ・統合版への変換でブロック・ブロックエンティティの変換精度を改善しました。[j2b, x2b]
 
 バージョン 1.21.0 (2023/8/22)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.26.3)
-project(je2be-ios LANGUAGES C CXX Swift VERSION 1.22.0)
+enable_language(OBJCXX)
+project(je2be-ios LANGUAGES C CXX Swift VERSION 1.23.0)
 
-set(je2be_iphoneos_deployment_target "15.0")
 set(je2be_product_bundle_identifier "com.github.kbinani.je2be-ios")
 
 set(CMAKE_CXX_STANDARD 20)
@@ -57,7 +57,6 @@ set_target_properties(je2be-ios PROPERTIES
   MACOSX_BUNDLE_LONG_VERSION_STRING "${CMAKE_PROJECT_VERSION}"
   MACOSX_BUNDLE_COPYRIGHT "Copyright © kbinani"
   XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${je2be_product_bundle_identifier}"
-  XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${je2be_iphoneos_deployment_target}"
   XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "src/BridgingHeader.h"
   XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon"
   XCODE_ATTRIBUTE_SWIFT_VERSION "5.0"
@@ -75,7 +74,6 @@ set_source_files_properties(resource/assets.xcassets PROPERTIES MACOSX_PACKAGE_L
 
 foreach(target IN ITEMS leveldb minizip libdeflate_static je2be)
   set_target_properties(${target} PROPERTIES
-    XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${je2be_iphoneos_deployment_target}"
     ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
   )
 endforeach()

diff --git a/build/Podfile.lock b/build/Podfile.lock
@@ -1,3 +1,3 @@
-PODFILE CHECKSUM: 4575611dbd05314371d15b86438f0f5dbdebc959
+PODFILE CHECKSUM: 4acb85f3cd5d7ae0293b0d273503857984a35c3c
 
 COCOAPODS: 1.12.0
diff --git a/build/configure.sh b/build/configure.sh
@@ -10,6 +10,11 @@ cmake .. -G Xcode \
     -DCMAKE_TOOLCHAIN_FILE=../deps/ios-cmake/ios.toolchain.cmake \
     -DENABLE_BITCODE=FALSE \
     -DPLATFORM=OS64COMBINED \
+    -DDEPLOYMENT_TARGET=15.0 \
+    -DENABLE_ARC=ON \
+    -DENABLE_VISIBILITY=OFF \
+    -DENABLE_STRICT_TRY_COMPILE=OFF \
+    -DNAMED_LANGUAGE_SUPPORT=ON \
 	-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=$CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM \
 	-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO \
 	-DLEVELDB_TCMALLOC=OFF \

diff --git a/resource/Settings.bundle/Root.plist b/resource/Settings.bundle/Root.plist
@@ -30,7 +30,7 @@
 		</dict>
 		<dict>
 			<key>DefaultValue</key>
-			<string>1.22.0</string>
+			<string>1.23.0</string>
 			<key>Key</key>
 			<string>version</string>
 			<key>Title</key>

diff --git a/resource/assets.xcassets/AppIcon.appiconset/Contents.json b/resource/assets.xcassets/AppIcon.appiconset/Contents.json
@@ -150,6 +150,66 @@
       "scale" : "1x",
       "size" : "1024x1024"
     },
+    {
+      "filename" : "16.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "32.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "32.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "64.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "256.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "256.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "512.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "512.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "1024.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    },
     {
       "filename" : "48.png",
       "idiom" : "watch",
@@ -225,6 +285,13 @@
       "size" : "51x51",
       "subtype" : "45mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "54x54",
+      "subtype" : "49mm"
+    },
     {
       "filename" : "172.png",
       "idiom" : "watch",
@@ -257,70 +324,17 @@
       "subtype" : "45mm"
     },
     {
-      "filename" : "1024.png",
-      "idiom" : "watch-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    },
-    {
-      "filename" : "16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "512.png",
-      "idiom" : "mac",
+      "idiom" : "watch",
+      "role" : "quickLook",
       "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
+      "size" : "129x129",
+      "subtype" : "49mm"
     },
     {
       "filename" : "1024.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
+      "idiom" : "watch-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {