diff --git a/.DS_Store b/.DS_Store index 38729c8..9b9bff9 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/fastlane/Fastfile b/fastlane/Fastfile index daea0ed..e95935f 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -24,18 +24,18 @@ lane :release do destination: "platform=macOS" ) - add_git_tag( - tag: tag - ) + #add_git_tag( + # tag: tag + #) push_to_git_remote set_github_release( repository_name: "RavanSA/j2m", api_bearer: ENV["GITHUB_TOKEN"], - name: "Release v#{get_version_number}.#{build_number}", + name: "Release test", tag_name: tag, - description: test, + description: "test", commitish: "main", upload_assets: ["j2m.app", "j2m.app.dSYM.zip"] ) diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile index af52d4e..02917d8 100644 --- a/fastlane/Pluginfile +++ b/fastlane/Pluginfile @@ -3,4 +3,3 @@ # Ensure this file is checked in to source control! gem 'fastlane-plugin-semantic_release' - diff --git a/fastlane/report.xml b/fastlane/report.xml index 7961a7d..f55a732 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,47 +5,44 @@ - + - + - + - + - + - + - + - + - - - - + diff --git a/j2m.app.dSYM.zip b/j2m.app.dSYM.zip index 6c73097..f7ee53f 100644 Binary files a/j2m.app.dSYM.zip and b/j2m.app.dSYM.zip differ diff --git a/j2m.app/Contents/Info.plist b/j2m.app/Contents/Info.plist index cfe8bbd..34a1791 100644 --- a/j2m.app/Contents/Info.plist +++ b/j2m.app/Contents/Info.plist @@ -25,7 +25,7 @@ MacOSX CFBundleVersion - 33 + 37 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild diff --git a/j2m.app/Contents/MacOS/j2m b/j2m.app/Contents/MacOS/j2m index d677ae8..ea6ec20 100755 Binary files a/j2m.app/Contents/MacOS/j2m and b/j2m.app/Contents/MacOS/j2m differ diff --git a/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist b/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist index c5f20a7..9b9f51e 100644 Binary files a/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist and b/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/Info.plist differ diff --git a/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib b/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib index 8d6bab9..ef3d52d 100644 Binary files a/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib and b/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/MainMenu.nib differ diff --git a/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib b/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib index fe64c37..05077b1 100644 Binary files a/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib and b/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib differ diff --git a/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib b/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib index 366545d..7b56143 100644 Binary files a/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib and b/j2m.app/Contents/Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib differ diff --git a/j2m.app/Contents/Resources/Json.storyboardc/Info.plist b/j2m.app/Contents/Resources/Json.storyboardc/Info.plist index 40cdb0a..cb4bf0a 100644 Binary files a/j2m.app/Contents/Resources/Json.storyboardc/Info.plist and b/j2m.app/Contents/Resources/Json.storyboardc/Info.plist differ diff --git a/j2m.app/Contents/Resources/Json.storyboardc/JsonViewController.nib b/j2m.app/Contents/Resources/Json.storyboardc/JsonViewController.nib index a01ee85..6405b90 100644 Binary files a/j2m.app/Contents/Resources/Json.storyboardc/JsonViewController.nib and b/j2m.app/Contents/Resources/Json.storyboardc/JsonViewController.nib differ diff --git a/j2m.app/Contents/Resources/Json.storyboardc/bU7-R8-ocO-view-tOy-S4-hL0.nib b/j2m.app/Contents/Resources/Json.storyboardc/bU7-R8-ocO-view-tOy-S4-hL0.nib index 220c018..f9e65bf 100644 Binary files a/j2m.app/Contents/Resources/Json.storyboardc/bU7-R8-ocO-view-tOy-S4-hL0.nib and b/j2m.app/Contents/Resources/Json.storyboardc/bU7-R8-ocO-view-tOy-S4-hL0.nib differ diff --git a/j2m.app/Contents/Resources/Languages.storyboardc/Info.plist b/j2m.app/Contents/Resources/Languages.storyboardc/Info.plist index 4c5202b..4e36b16 100644 Binary files a/j2m.app/Contents/Resources/Languages.storyboardc/Info.plist and b/j2m.app/Contents/Resources/Languages.storyboardc/Info.plist differ diff --git a/j2m.app/Contents/Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects-110000.nib b/j2m.app/Contents/Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects-110000.nib index 46c1fb6..ec506d8 100644 Binary files a/j2m.app/Contents/Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects-110000.nib and b/j2m.app/Contents/Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects-110000.nib differ diff --git a/j2m.app/Contents/Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects.nib b/j2m.app/Contents/Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects.nib index 24174f5..f00716d 100644 Binary files a/j2m.app/Contents/Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects.nib and b/j2m.app/Contents/Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects.nib differ diff --git a/j2m.app/Contents/Resources/Model.storyboardc/Info.plist b/j2m.app/Contents/Resources/Model.storyboardc/Info.plist index 6f5f670..1ab0f3e 100644 Binary files a/j2m.app/Contents/Resources/Model.storyboardc/Info.plist and b/j2m.app/Contents/Resources/Model.storyboardc/Info.plist differ diff --git a/j2m.app/Contents/Resources/Model.storyboardc/ModelViewController.nib b/j2m.app/Contents/Resources/Model.storyboardc/ModelViewController.nib index 3efa538..230597b 100644 Binary files a/j2m.app/Contents/Resources/Model.storyboardc/ModelViewController.nib and b/j2m.app/Contents/Resources/Model.storyboardc/ModelViewController.nib differ diff --git a/j2m.app/Contents/Resources/Model.storyboardc/bU7-R8-ocO-view-rt7-fA-Mk7.nib b/j2m.app/Contents/Resources/Model.storyboardc/bU7-R8-ocO-view-rt7-fA-Mk7.nib index 69ac672..bc9eff5 100644 Binary files a/j2m.app/Contents/Resources/Model.storyboardc/bU7-R8-ocO-view-rt7-fA-Mk7.nib and b/j2m.app/Contents/Resources/Model.storyboardc/bU7-R8-ocO-view-rt7-fA-Mk7.nib differ diff --git a/j2m.app/Contents/Resources/Settings.storyboardc/Info.plist b/j2m.app/Contents/Resources/Settings.storyboardc/Info.plist index c712e6b..197a283 100644 Binary files a/j2m.app/Contents/Resources/Settings.storyboardc/Info.plist and b/j2m.app/Contents/Resources/Settings.storyboardc/Info.plist differ diff --git a/j2m.app/Contents/Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects-110000.nib b/j2m.app/Contents/Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects-110000.nib index 60a24bc..72c5d3e 100644 Binary files a/j2m.app/Contents/Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects-110000.nib and b/j2m.app/Contents/Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects-110000.nib differ diff --git a/j2m.app/Contents/Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects.nib b/j2m.app/Contents/Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects.nib index 213c421..a100d96 100644 Binary files a/j2m.app/Contents/Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects.nib and b/j2m.app/Contents/Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects.nib differ diff --git a/j2m.app/Contents/_CodeSignature/CodeResources b/j2m.app/Contents/_CodeSignature/CodeResources index 740a0ef..d298d0b 100644 --- a/j2m.app/Contents/_CodeSignature/CodeResources +++ b/j2m.app/Contents/_CodeSignature/CodeResources @@ -6,11 +6,11 @@ Resources/Base.lproj/Main.storyboardc/Info.plist - 7vNutBwdXw3IHmCYCqkaWlMCjkw= + po5RLXPYemhN1BuOd09dTVD56qY= Resources/Base.lproj/Main.storyboardc/MainMenu.nib - 5lRx9FtUrfE1QhMEtMGhjgDoPtQ= + AKkUnYlo5uagO98jYgTuK+hewNc= Resources/Base.lproj/Main.storyboardc/NSViewController-9Li-We-9RP.nib @@ -26,35 +26,35 @@ Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib - IR/kQt+ZNCJYhQUkzoWV8uPC50E= + s86nUOSVRW9/2rd717j8H6l4ERc= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib - j7pMewuqtJKTZqWyBxt6hkUlQc4= + /BZSPIp/5p46fgAc0q1DYSfoX7I= Resources/Json.storyboardc/Info.plist - At5kvG627DVg398UDm21YcylkTU= + tdegFPJXc/uPrhZs476bQv6kVPQ= Resources/Json.storyboardc/JsonViewController.nib - s3XpwoHOeStj8hCpLDl7UjNYH4s= + gr0OHiTnwqYP5fov3iaUQVgz2FU= Resources/Json.storyboardc/bU7-R8-ocO-view-tOy-S4-hL0.nib - XV4pYGZV5E6YFSoVOHyxtN/hbyc= + FJ0Zkj8fIdyXk48FaUYlgFlPra0= Resources/Languages.storyboardc/Info.plist - tRnhYlG4WrD/KFAm08nzicgMhsM= + ZOTb82MXaGI9jigd/JZQpTtoHZk= Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects-110000.nib - cHHwZgC3Qt5OpshN0+LdEIfGY1k= + RQ+plRdbeTBJaCuFekGM3qtGtlA= Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects.nib - PCJzkB2lasRe8DBRX0f6OjdEuH4= + hKR9f7U3jCL493my6T3zf6Sphwk= Resources/Languages.storyboardc/Vac-0h-ATt-view-5qi-Wi-hMd.nib/keyedobjects-110000.nib @@ -66,27 +66,27 @@ Resources/Model.storyboardc/Info.plist - 6/5/9uJ6uAazfX3P6Tc1qdeMJSQ= + SnLbeuS3NqcOxhrCsaQfZPq9kcg= Resources/Model.storyboardc/ModelViewController.nib - 4GqK2ZHK5bmstVoXLBnQhZwYyHk= + eXNCIevwbyeyqN/D6zt8CPrPUP0= Resources/Model.storyboardc/bU7-R8-ocO-view-rt7-fA-Mk7.nib - 7oKz/8J7CSNWfoVAUrToWmbQ3DE= + plEc8+2wBwu+Wy2KyAJpr45+OFk= Resources/Settings.storyboardc/Info.plist - QDtLXx4nYnl8uPca7AQUw9nvaQ8= + 6GF13ryvZnBsC2rK1eilAZCvXsA= Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects-110000.nib - Fa+T2kxsX6tycZtqhhi712sRXV4= + MKbxohlSnDXqWv1i3tyc+uorQHI= Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects.nib - c08+WNs+5T5nbNEwZjYn5BGu3O4= + Q7sJzWg1utuiqJEJi6+PfndGiqQ= Resources/Settings.storyboardc/bU7-R8-ocO-view-tOy-S4-hL0.nib/keyedobjects-110000.nib @@ -250,14 +250,14 @@ hash2 - lfScWoZMzdvhNThsMGmfLEzXP19nI3E7pPMmELLwjZA= + J2Xd5AKiiLVKjCmZQKHEOdB9cGCb0wNwOh20MiPiwh0= Resources/Base.lproj/Main.storyboardc/MainMenu.nib hash2 - dFugBbZ6M3CoJVQ5ek0qaSvVUTC331G64EvxNlkvak0= + N+FxkwSpiKWDy4liC9flvL2mPBqo/ISxNIjYs19i+fE= Resources/Base.lproj/Main.storyboardc/NSViewController-9Li-We-9RP.nib @@ -285,56 +285,56 @@ hash2 - avVIJS86OBFbC4MAdQ6pG+SYVrJSDGjrRKUU96zDqgY= + +ciPgVQL9O39vAUpbjNv6FGj2SKB6wlLzEWh6p+rOko= Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib hash2 - QqGoWXo52jxUVSq4kUHx+sn0dsFZoa9n7Hzk8DycRx8= + V5hkL65rWk/YDNOKpGzLG7Tc8xgwUL+6Ck6zv/GQWQ0= Resources/Json.storyboardc/Info.plist hash2 - Cr3xRm3KkLnzjVTfg/YnRP5zjx/mtKVqvwvAYP3549E= + 3oXj17GkJPvGV+sLxKNpfXhDEqLbQEWwYlWLmxk5940= Resources/Json.storyboardc/JsonViewController.nib hash2 - rokL2yqGj5ej+EU1YCvy+y50LLtBjJnDz/tRoL5oO30= + KEIc5hzmTtMJWgMtVfFNJzMTAycgDJrNUfKkZLNTpyI= Resources/Json.storyboardc/bU7-R8-ocO-view-tOy-S4-hL0.nib hash2 - 2NyFfXAxiBkbl9hmH8y93ZkelWkGfBtf/ZT9nQe4h6o= + AIEBeN4RWnk8U5hpb50/6sUGVkq5JBgkGVTEOdDcPgw= Resources/Languages.storyboardc/Info.plist hash2 - YWwww9CNb5R1sIIIGAcRnzPMNujaud2cXYDBWVfoamo= + zXjZ+XarfPd+iHcctbDTzC1j//cYDR0mX6Y5u2S09fc= Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects-110000.nib hash2 - FulKtoNaF+z2QDnCzUHNN8d7gHY4RZEXmkOGygYNzd0= + JS2yZw5hGzHB5CIz3rw6eAhHXRHEeRelRu/eoaRVzWU= Resources/Languages.storyboardc/LanguagesViewController.nib/keyedobjects.nib hash2 - oTy2cYwOoVVqKgT7cWANXO4uOBYmBhG5/Duft4v0clo= + 5CI7FmFfSNtSBcPag4qmM0PON7e76Hykxbzz/wX9q2I= Resources/Languages.storyboardc/Vac-0h-ATt-view-5qi-Wi-hMd.nib/keyedobjects-110000.nib @@ -355,42 +355,42 @@ hash2 - u1v4EGQXbICjygrWJq4ZTsQtTshaQ9xX0O+Ie0Tgojc= + dnxeAlR+yT2b4K7z7Dii0K93XelUSiGJf4VxRzoC3HY= Resources/Model.storyboardc/ModelViewController.nib hash2 - ZVELv8t3sPwhZaTb8X+Gb97kTrXuV3At1tKX8y84adY= + gZ7li6kZ9jK3PL0CHKaybtthfZp3yaNMPzO3gmYmmW0= Resources/Model.storyboardc/bU7-R8-ocO-view-rt7-fA-Mk7.nib hash2 - dTfDdDSnGkxrZgAjXERsJ6w5Dql01nDlnxeUzSqSFCY= + ST9Jxu/a9DGJkqLPPI2NFkKHqRzOu1y4n35lrGZgOvo= Resources/Settings.storyboardc/Info.plist hash2 - UwN52GKHoInQl6GkHS/QIgheU9zLzHhqp4KWLTx6bB8= + 7BWNzkRV5fdmRXaz7rRxALPI42oLAK4GKGPurmUy4Cc= Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects-110000.nib hash2 - FclGHXwTAdUY5Txd/vIt9MhrMrX05szKrpSXkJLcEAU= + A3RxGq/tj8V9QdJG3NmB4f5s8lJBbTEPeKHa4/ONB+o= Resources/Settings.storyboardc/SettingsViewController.nib/keyedobjects.nib hash2 - vuMQOKSjvU7PCSIhAc6LYZz2y/DCvTzDVNibzOjoE/M= + 9FbVlxFx1lSZvCUxbRTKizYZmjtQDztsMb+rkMYDGVw= Resources/Settings.storyboardc/bU7-R8-ocO-view-tOy-S4-hL0.nib/keyedobjects-110000.nib diff --git a/j2m.xcodeproj/project.pbxproj b/j2m.xcodeproj/project.pbxproj index 2d295d8..75b4a41 100644 --- a/j2m.xcodeproj/project.pbxproj +++ b/j2m.xcodeproj/project.pbxproj @@ -40,8 +40,6 @@ 52CB168647FC6C82BB217A34 /* Pods_j2m.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_j2m.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7BF785A04FB72AC5B8BA0BD4 /* Pods-j2m.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-j2m.debug.xcconfig"; path = "Target Support Files/Pods-j2m/Pods-j2m.debug.xcconfig"; sourceTree = ""; }; 7F69277C4FCF9675C26B0674 /* Pods-j2m.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-j2m.release.xcconfig"; path = "Target Support Files/Pods-j2m/Pods-j2m.release.xcconfig"; sourceTree = ""; }; - 863A6352A6C6F1020F0750E5 /* Pods-testapp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-testapp.release.xcconfig"; path = "Target Support Files/Pods-testapp/Pods-testapp.release.xcconfig"; sourceTree = ""; }; - ACDE9216DE5CDD31C277CC09 /* Pods-testapp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-testapp.debug.xcconfig"; path = "Target Support Files/Pods-testapp/Pods-testapp.debug.xcconfig"; sourceTree = ""; }; C917FF142BB3FF9E00016FF4 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = ""; }; C98FDA992BA9BFC200DE2CB6 /* Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helpers.swift; sourceTree = ""; }; C98FDA9C2BA9DE0400DE2CB6 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; @@ -101,8 +99,6 @@ 840859BDD8F941745301AD94 /* Pods */ = { isa = PBXGroup; children = ( - ACDE9216DE5CDD31C277CC09 /* Pods-testapp.debug.xcconfig */, - 863A6352A6C6F1020F0750E5 /* Pods-testapp.release.xcconfig */, 7BF785A04FB72AC5B8BA0BD4 /* Pods-j2m.debug.xcconfig */, 7F69277C4FCF9675C26B0674 /* Pods-j2m.release.xcconfig */, ); @@ -386,6 +382,7 @@ /* Begin XCBuildConfiguration section */ C9A2C0222BA19A6E0090534B /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 7F69277C4FCF9675C26B0674 /* Pods-j2m.release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; @@ -451,6 +448,7 @@ }; C9A2C0232BA19A6E0090534B /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 7F69277C4FCF9675C26B0674 /* Pods-j2m.release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; @@ -517,7 +515,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 33; + CURRENT_PROJECT_VERSION = 37; DEVELOPMENT_TEAM = ""; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; @@ -551,7 +549,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 33; + CURRENT_PROJECT_VERSION = 37; DEVELOPMENT_TEAM = ""; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES;