diff --git a/.gitignore b/.gitignore index 064763b4..52afc45a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ yarn-error.log* *.iml /lerna-debug.log /release/ +/app/tauri/.cargo/ diff --git a/README.md b/README.md index 5f76c6a4..25fe93e0 100644 --- a/README.md +++ b/README.md @@ -200,6 +200,8 @@ Please ensure that you have the [pre-requisites](https://beta.tauri.app/guides/prerequisites/) installed. Android or iOS may require a little more setup. +Also, the Android dev only works on linux and iOS dev only works on macOS. +The Android one is due to an issue compiling openssl-sys on windows and the iOS one is because Apple requires you to use a Mac to build iOS apps. And then you should just be able to run any of the tauri configurations like so diff --git a/app/tauri/.cargo/config.toml b/app/tauri/.cargo/config.toml deleted file mode 100644 index 3755911f..00000000 --- a/app/tauri/.cargo/config.toml +++ /dev/null @@ -1,4 +0,0 @@ -[build] -target = 'x86_64-pc-windows-msvc' - -[target] diff --git a/app/tauri/Cargo.lock b/app/tauri/Cargo.lock index b67600fc..304fbc30 100644 --- a/app/tauri/Cargo.lock +++ b/app/tauri/Cargo.lock @@ -2280,9 +2280,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -2312,9 +2312,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", diff --git a/app/tauri/Cargo.toml b/app/tauri/Cargo.toml index 801bd77e..ad8196bd 100644 --- a/app/tauri/Cargo.toml +++ b/app/tauri/Cargo.toml @@ -11,6 +11,10 @@ repository = "https://github.com/zidoro/pomatez" edition = "2021" rust-version = "1.57" +[lib] +name = "pomatez_lib" +crate-type = ["staticlib", "cdylib", "rlib"] + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] diff --git a/app/tauri/gen/apple/.gitignore b/app/tauri/gen/apple/.gitignore new file mode 100644 index 00000000..6726e2f8 --- /dev/null +++ b/app/tauri/gen/apple/.gitignore @@ -0,0 +1,3 @@ +xcuserdata/ +build/ +Externals/ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png new file mode 100644 index 00000000..f8b128e3 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png new file mode 100644 index 00000000..6bbd9e3c Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png new file mode 100644 index 00000000..6bbd9e3c Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png new file mode 100644 index 00000000..f702cc04 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png new file mode 100644 index 00000000..c5e92f78 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png new file mode 100644 index 00000000..1c607d5c Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png new file mode 100644 index 00000000..1c607d5c Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png new file mode 100644 index 00000000..60e93a6a Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png new file mode 100644 index 00000000..6bbd9e3c Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png new file mode 100644 index 00000000..819410f9 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png new file mode 100644 index 00000000..819410f9 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png new file mode 100644 index 00000000..e00ae5a6 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png new file mode 100644 index 00000000..f5301f37 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512x512@2x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512x512@2x.png new file mode 100644 index 00000000..5e9add73 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512x512@2x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png new file mode 100644 index 00000000..e00ae5a6 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png new file mode 100644 index 00000000..3546ca10 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png new file mode 100644 index 00000000..d8367101 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png new file mode 100644 index 00000000..29925f2a Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png new file mode 100644 index 00000000..dfd22619 Binary files /dev/null and b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png differ diff --git a/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..dd3b8bcc --- /dev/null +++ b/app/tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images": [ + { + "size": "20x20", + "idiom": "iphone", + "filename": "AppIcon-20x20@2x.png", + "scale": "2x" + }, + { + "size": "20x20", + "idiom": "iphone", + "filename": "AppIcon-20x20@3x.png", + "scale": "3x" + }, + { + "size": "29x29", + "idiom": "iphone", + "filename": "AppIcon-29x29@2x-1.png", + "scale": "2x" + }, + { + "size": "29x29", + "idiom": "iphone", + "filename": "AppIcon-29x29@3x.png", + "scale": "3x" + }, + { + "size": "40x40", + "idiom": "iphone", + "filename": "AppIcon-40x40@2x.png", + "scale": "2x" + }, + { + "size": "40x40", + "idiom": "iphone", + "filename": "AppIcon-40x40@3x.png", + "scale": "3x" + }, + { + "size": "60x60", + "idiom": "iphone", + "filename": "AppIcon-60x60@2x.png", + "scale": "2x" + }, + { + "size": "60x60", + "idiom": "iphone", + "filename": "AppIcon-60x60@3x.png", + "scale": "3x" + }, + { + "size": "20x20", + "idiom": "ipad", + "filename": "AppIcon-20x20@1x.png", + "scale": "1x" + }, + { + "size": "20x20", + "idiom": "ipad", + "filename": "AppIcon-20x20@2x-1.png", + "scale": "2x" + }, + { + "size": "29x29", + "idiom": "ipad", + "filename": "AppIcon-29x29@1x.png", + "scale": "1x" + }, + { + "size": "29x29", + "idiom": "ipad", + "filename": "AppIcon-29x29@2x.png", + "scale": "2x" + }, + { + "size": "40x40", + "idiom": "ipad", + "filename": "AppIcon-40x40@1x.png", + "scale": "1x" + }, + { + "size": "40x40", + "idiom": "ipad", + "filename": "AppIcon-40x40@2x-1.png", + "scale": "2x" + }, + { + "size": "76x76", + "idiom": "ipad", + "filename": "AppIcon-76x76@1x.png", + "scale": "1x" + }, + { + "size": "76x76", + "idiom": "ipad", + "filename": "AppIcon-76x76@2x.png", + "scale": "2x" + }, + { + "size": "83.5x83.5", + "idiom": "ipad", + "filename": "AppIcon-83.5x83.5@2x.png", + "scale": "2x" + }, + { + "size": "1024x1024", + "idiom": "ios-marketing", + "filename": "AppIcon-512@2x.png", + "scale": "1x" + } + ], + "info": { + "version": 1, + "author": "xcode" + } +} diff --git a/app/tauri/gen/apple/Assets.xcassets/Contents.json b/app/tauri/gen/apple/Assets.xcassets/Contents.json new file mode 100644 index 00000000..97a8662e --- /dev/null +++ b/app/tauri/gen/apple/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info": { + "version": 1, + "author": "xcode" + } +} diff --git a/app/tauri/gen/apple/ExportOptions.plist b/app/tauri/gen/apple/ExportOptions.plist new file mode 100644 index 00000000..b69cf1de --- /dev/null +++ b/app/tauri/gen/apple/ExportOptions.plist @@ -0,0 +1,8 @@ + + + + + method + development + + diff --git a/app/tauri/gen/apple/Podfile b/app/tauri/gen/apple/Podfile new file mode 100644 index 00000000..a6b2199a --- /dev/null +++ b/app/tauri/gen/apple/Podfile @@ -0,0 +1,21 @@ +# Uncomment the next line to define a global platform for your project + +target 'pomatez_iOS' do +platform :ios, '13.0' + # Pods for pomatez_iOS +end + +target 'pomatez_macOS' do +platform :osx, '11.0' + # Pods for pomatez_macOS +end + +# Delete the deployment target for iOS and macOS, causing it to be inherited from the Podfile +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' + config.build_settings.delete 'MACOSX_DEPLOYMENT_TARGET' + end + end +end diff --git a/app/tauri/gen/apple/Sources/pomatez/bindings/bindings.h b/app/tauri/gen/apple/Sources/pomatez/bindings/bindings.h new file mode 100644 index 00000000..51522007 --- /dev/null +++ b/app/tauri/gen/apple/Sources/pomatez/bindings/bindings.h @@ -0,0 +1,8 @@ +#pragma once + +namespace ffi { + extern "C" { + void start_app(); + } +} + diff --git a/app/tauri/gen/apple/Sources/pomatez/main.mm b/app/tauri/gen/apple/Sources/pomatez/main.mm new file mode 100644 index 00000000..7793a9d5 --- /dev/null +++ b/app/tauri/gen/apple/Sources/pomatez/main.mm @@ -0,0 +1,6 @@ +#include "bindings/bindings.h" + +int main(int argc, char * argv[]) { + ffi::start_app(); + return 0; +} diff --git a/app/tauri/gen/apple/pomatez.xcodeproj/project.pbxproj b/app/tauri/gen/apple/pomatez.xcodeproj/project.pbxproj new file mode 100644 index 00000000..eaf053a6 --- /dev/null +++ b/app/tauri/gen/apple/pomatez.xcodeproj/project.pbxproj @@ -0,0 +1,465 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 0E73194C370242BA0672685A /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = FF594C8B7B838F5DC8253895 /* main.mm */; }; + 1828EA707D675CA43AD0C021 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D69D650EBB8987E11DA3AD9A /* CoreGraphics.framework */; }; + 266C030831D93741EE87F804 /* libpomatez.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FAA3B6C73D09A559E849A0B /* libpomatez.a */; }; + 3375A903EED4C310F93A5F41 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3F1BEDBB190142CAFC748FEC /* Assets.xcassets */; }; + 4A8292C66E5C16B6A997AB4D /* assets in Resources */ = {isa = PBXBuildFile; fileRef = D8469C4FBE64500448442B93 /* assets */; }; + A6ABC3D49778212EBF55AB5D /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B478B8146852093869DBAB06 /* WebKit.framework */; }; + AEB2F1A279E64D7357C62ECC /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D7D53A9230BB5602199B74A /* MetalKit.framework */; }; + C50D84468DACC3D21281B4F2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F0B951715D36C8F3EF902710 /* UIKit.framework */; }; + C7C603EBC266A435CE1CA389 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EC80E0387671021C43156452 /* Security.framework */; }; + EF1211B833C1D2EBF720B6BB /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B0BF6C26872684E733BA37D /* Metal.framework */; }; + EFEB1B07C6CBCA897D3506FF /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F517A08ACB3C99339208ECEC /* QuartzCore.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 3D7D53A9230BB5602199B74A /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; }; + 3F1BEDBB190142CAFC748FEC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 3FAA3B6C73D09A559E849A0B /* libpomatez.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpomatez.a; sourceTree = ""; }; + 5847E0A483E1D4416F0A93D8 /* global_shortcuts.rs */ = {isa = PBXFileReference; path = global_shortcuts.rs; sourceTree = ""; }; + 5BCC6085DA3BAAD6F0D2724E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; + 5E54572C28EC544931F1901B /* updater.rs */ = {isa = PBXFileReference; path = updater.rs; sourceTree = ""; }; + 7B0BF6C26872684E733BA37D /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; }; + 8FEF8906163FB03D4B833A4B /* bindings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bindings.h; sourceTree = ""; }; + 9D8D5B5BFA81B2CA2F94B120 /* main.rs */ = {isa = PBXFileReference; path = main.rs; sourceTree = ""; }; + 9E73DDB0E61619020B6916BE /* commands.rs */ = {isa = PBXFileReference; path = commands.rs; sourceTree = ""; }; + B1FCAA4D6A85DA8C08666168 /* pomatez_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = pomatez_iOS.entitlements; sourceTree = ""; }; + B478B8146852093869DBAB06 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; + D69D650EBB8987E11DA3AD9A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + D8469C4FBE64500448442B93 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = SOURCE_ROOT; }; + E60E0A2213884FB3CCD84C2C /* pomatez_iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = pomatez_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; + EC80E0387671021C43156452 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + F0B951715D36C8F3EF902710 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + F517A08ACB3C99339208ECEC /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + FE1746F712051F16E9E8CC8F /* system_tray.rs */ = {isa = PBXFileReference; path = system_tray.rs; sourceTree = ""; }; + FF594C8B7B838F5DC8253895 /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 7660B3AC2E6A6445E4D1E8D7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 266C030831D93741EE87F804 /* libpomatez.a in Frameworks */, + 1828EA707D675CA43AD0C021 /* CoreGraphics.framework in Frameworks */, + EF1211B833C1D2EBF720B6BB /* Metal.framework in Frameworks */, + AEB2F1A279E64D7357C62ECC /* MetalKit.framework in Frameworks */, + EFEB1B07C6CBCA897D3506FF /* QuartzCore.framework in Frameworks */, + C7C603EBC266A435CE1CA389 /* Security.framework in Frameworks */, + C50D84468DACC3D21281B4F2 /* UIKit.framework in Frameworks */, + A6ABC3D49778212EBF55AB5D /* WebKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 0F2FD43F5D8A28D897A3B985 /* pomatez_iOS */ = { + isa = PBXGroup; + children = ( + 5BCC6085DA3BAAD6F0D2724E /* Info.plist */, + B1FCAA4D6A85DA8C08666168 /* pomatez_iOS.entitlements */, + ); + path = pomatez_iOS; + sourceTree = ""; + }; + 55BADEE83F18CC89365012A2 /* Frameworks */ = { + isa = PBXGroup; + children = ( + D69D650EBB8987E11DA3AD9A /* CoreGraphics.framework */, + 3FAA3B6C73D09A559E849A0B /* libpomatez.a */, + 7B0BF6C26872684E733BA37D /* Metal.framework */, + 3D7D53A9230BB5602199B74A /* MetalKit.framework */, + F517A08ACB3C99339208ECEC /* QuartzCore.framework */, + EC80E0387671021C43156452 /* Security.framework */, + F0B951715D36C8F3EF902710 /* UIKit.framework */, + B478B8146852093869DBAB06 /* WebKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 6776EFF11F28679BF93DE834 /* Products */ = { + isa = PBXGroup; + children = ( + E60E0A2213884FB3CCD84C2C /* pomatez_iOS.app */, + ); + name = Products; + sourceTree = ""; + }; + 9FAADF5648F0DDF5E03B9387 /* src */ = { + isa = PBXGroup; + children = ( + 9E73DDB0E61619020B6916BE /* commands.rs */, + 5847E0A483E1D4416F0A93D8 /* global_shortcuts.rs */, + 9D8D5B5BFA81B2CA2F94B120 /* main.rs */, + FE1746F712051F16E9E8CC8F /* system_tray.rs */, + 5E54572C28EC544931F1901B /* updater.rs */, + ); + name = src; + path = ../../src; + sourceTree = ""; + }; + AFF4273173266EFBFC00D99B = { + isa = PBXGroup; + children = ( + D8469C4FBE64500448442B93 /* assets */, + 3F1BEDBB190142CAFC748FEC /* Assets.xcassets */, + D25824ADD8AF17C03D2FDA65 /* Externals */, + 0F2FD43F5D8A28D897A3B985 /* pomatez_iOS */, + FF1AB594AC16B80FD6015CA7 /* Sources */, + 9FAADF5648F0DDF5E03B9387 /* src */, + 55BADEE83F18CC89365012A2 /* Frameworks */, + 6776EFF11F28679BF93DE834 /* Products */, + ); + sourceTree = ""; + }; + B16F2AAC0808ACDDC2696EFC /* pomatez */ = { + isa = PBXGroup; + children = ( + FF594C8B7B838F5DC8253895 /* main.mm */, + D73FCC1846A796456D06DCF6 /* bindings */, + ); + path = pomatez; + sourceTree = ""; + }; + D25824ADD8AF17C03D2FDA65 /* Externals */ = { + isa = PBXGroup; + children = ( + ); + path = Externals; + sourceTree = ""; + }; + D73FCC1846A796456D06DCF6 /* bindings */ = { + isa = PBXGroup; + children = ( + 8FEF8906163FB03D4B833A4B /* bindings.h */, + ); + path = bindings; + sourceTree = ""; + }; + FF1AB594AC16B80FD6015CA7 /* Sources */ = { + isa = PBXGroup; + children = ( + B16F2AAC0808ACDDC2696EFC /* pomatez */, + ); + path = Sources; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + C25E2398BA6CC36C3C0EBDFA /* pomatez_iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = BD1684651D5C43AB34A47B11 /* Build configuration list for PBXNativeTarget "pomatez_iOS" */; + buildPhases = ( + 774F853B85668DCFDE51B075 /* Build Rust Code */, + 0A17D7E55F3B83462304CD02 /* Sources */, + 89EEAFE3F87DEE17E7B88B08 /* Resources */, + 7660B3AC2E6A6445E4D1E8D7 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = pomatez_iOS; + productName = pomatez_iOS; + productReference = E60E0A2213884FB3CCD84C2C /* pomatez_iOS.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 1D8B94D0E879CAEBEF7CF120 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1430; + TargetAttributes = { + C25E2398BA6CC36C3C0EBDFA = { + DevelopmentTeam = RY2LFV2C36; + }; + }; + }; + buildConfigurationList = B16D1AEFD2E4EF10E38D330E /* Build configuration list for PBXProject "pomatez" */; + compatibilityVersion = "Xcode 14.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + Base, + en, + ); + mainGroup = AFF4273173266EFBFC00D99B; + projectDirPath = ""; + projectRoot = ""; + targets = ( + C25E2398BA6CC36C3C0EBDFA /* pomatez_iOS */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 89EEAFE3F87DEE17E7B88B08 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3375A903EED4C310F93A5F41 /* Assets.xcassets in Resources */, + 4A8292C66E5C16B6A997AB4D /* assets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 774F853B85668DCFDE51B075 /* Build Rust Code */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Build Rust Code"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(SRCROOT)/target/aarch64-apple-ios/${CONFIGURATION}/deps/libpomatez.a", + "$(SRCROOT)/target/x86_64-apple-ios/${CONFIGURATION}/deps/libpomatez.a", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "yarn tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 0A17D7E55F3B83462304CD02 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0E73194C370242BA0672685A /* main.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 6FB5D64DD6291FD44DE7C00A /* release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; + }; + name = release; + }; + 797EFB054E7BF3D5B891803E /* debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ARCHS = ( + arm64, + x86_64, + ); + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = pomatez_iOS/pomatez_iOS.entitlements; + CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = RY2LFV2C36; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\".\"", + ); + INFOPLIST_FILE = pomatez_iOS/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + "LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = "$(inherited) $(PROJECT_DIR)/Externals/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)"; + "LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)"; + "LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = com.roldanjr.pomatez; + PRODUCT_NAME = Pomatez; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 x86_64"; + }; + name = debug; + }; + B2BA8D90D811268A8844DA4F /* debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "DEBUG=1", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = debug; + }; + B389B0D8A233039E8A48911D /* release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ARCHS = ( + arm64, + x86_64, + ); + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = pomatez_iOS/pomatez_iOS.entitlements; + CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = RY2LFV2C36; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\".\"", + ); + INFOPLIST_FILE = pomatez_iOS/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + "LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = "$(inherited) $(PROJECT_DIR)/Externals/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)"; + "LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)"; + "LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = com.roldanjr.pomatez; + PRODUCT_NAME = Pomatez; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 x86_64"; + }; + name = release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + B16D1AEFD2E4EF10E38D330E /* Build configuration list for PBXProject "pomatez" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B2BA8D90D811268A8844DA4F /* debug */, + 6FB5D64DD6291FD44DE7C00A /* release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = debug; + }; + BD1684651D5C43AB34A47B11 /* Build configuration list for PBXNativeTarget "pomatez_iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 797EFB054E7BF3D5B891803E /* debug */, + B389B0D8A233039E8A48911D /* release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = debug; + }; +/* End XCConfigurationList section */ + }; + rootObject = 1D8B94D0E879CAEBEF7CF120 /* Project object */; +} diff --git a/app/tauri/gen/apple/pomatez.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/app/tauri/gen/apple/pomatez.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/app/tauri/gen/apple/pomatez.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/app/tauri/gen/apple/pomatez.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/app/tauri/gen/apple/pomatez.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..ac90d5ac --- /dev/null +++ b/app/tauri/gen/apple/pomatez.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + BuildSystemType + Original + DisableBuildSystemDeprecationDiagnostic + + + diff --git a/app/tauri/gen/apple/pomatez.xcodeproj/xcshareddata/xcschemes/pomatez_iOS.xcscheme b/app/tauri/gen/apple/pomatez.xcodeproj/xcshareddata/xcschemes/pomatez_iOS.xcscheme new file mode 100644 index 00000000..436e6627 --- /dev/null +++ b/app/tauri/gen/apple/pomatez.xcodeproj/xcshareddata/xcschemes/pomatez_iOS.xcscheme @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/tauri/gen/apple/pomatez_iOS/Info.plist b/app/tauri/gen/apple/pomatez_iOS/Info.plist new file mode 100644 index 00000000..1edcf1f6 --- /dev/null +++ b/app/tauri/gen/apple/pomatez_iOS/Info.plist @@ -0,0 +1,44 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.4.1 + CFBundleVersion + 1.4.1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + arm64 + metal + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/app/tauri/gen/apple/pomatez_iOS/pomatez_iOS.entitlements b/app/tauri/gen/apple/pomatez_iOS/pomatez_iOS.entitlements new file mode 100644 index 00000000..0c67376e --- /dev/null +++ b/app/tauri/gen/apple/pomatez_iOS/pomatez_iOS.entitlements @@ -0,0 +1,5 @@ + + + + + diff --git a/app/tauri/gen/apple/project.yml b/app/tauri/gen/apple/project.yml new file mode 100644 index 00000000..62bcc481 --- /dev/null +++ b/app/tauri/gen/apple/project.yml @@ -0,0 +1,88 @@ +name: pomatez +options: + bundleIdPrefix: com.roldanjr + deploymentTarget: + iOS: 13.0 +fileGroups: [../../src] +configs: + debug: debug + release: release +settingGroups: + app: + base: + PRODUCT_NAME: Pomatez + PRODUCT_BUNDLE_IDENTIFIER: com.roldanjr.pomatez + DEVELOPMENT_TEAM: RY2LFV2C36 +targetTemplates: + app: + type: application + sources: + - path: Sources + scheme: + environmentVariables: + RUST_BACKTRACE: full + RUST_LOG: info + settings: + groups: [app] +targets: + pomatez_iOS: + type: application + platform: iOS + sources: + - path: Sources + - path: Assets.xcassets + - path: Externals + - path: pomatez_iOS + - path: assets + buildPhase: resources + type: folder + info: + path: pomatez_iOS/Info.plist + properties: + LSRequiresIPhoneOS: true + UILaunchStoryboardName: LaunchScreen + UIRequiredDeviceCapabilities: [arm64, metal] + UISupportedInterfaceOrientations: + - UIInterfaceOrientationPortrait + - UIInterfaceOrientationLandscapeLeft + - UIInterfaceOrientationLandscapeRight + UISupportedInterfaceOrientations~ipad: + - UIInterfaceOrientationPortrait + - UIInterfaceOrientationPortraitUpsideDown + - UIInterfaceOrientationLandscapeLeft + - UIInterfaceOrientationLandscapeRight + CFBundleShortVersionString: 1.4.1 + CFBundleVersion: 1.4.1 + entitlements: + path: pomatez_iOS/pomatez_iOS.entitlements + scheme: + environmentVariables: + RUST_BACKTRACE: full + RUST_LOG: info + settings: + base: + ENABLE_BITCODE: false + ARCHS: [arm64, x86_64] + VALID_ARCHS: arm64 x86_64 + LIBRARY_SEARCH_PATHS[arch=x86_64]: $(inherited) $(PROJECT_DIR)/Externals/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME) + LIBRARY_SEARCH_PATHS[arch=arm64]: $(inherited) $(PROJECT_DIR)/Externals/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME) + LIBRARY_SEARCH_PATHS[arch=arm64-sim]: $(inherited) $(PROJECT_DIR)/Externals/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME) + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: true + groups: [app] + dependencies: + - framework: libpomatez.a + embed: false + - sdk: CoreGraphics.framework + - sdk: Metal.framework + - sdk: MetalKit.framework + - sdk: QuartzCore.framework + - sdk: Security.framework + - sdk: UIKit.framework + - sdk: WebKit.framework + preBuildScripts: + - script: yarn tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths "${FRAMEWORK_SEARCH_PATHS:?}" --header-search-paths "${HEADER_SEARCH_PATHS:?}" --gcc-preprocessor-definitions "${GCC_PREPROCESSOR_DEFINITIONS:-}" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?} + name: Build Rust Code + basedOnDependencyAnalysis: false + outputFiles: + - $(SRCROOT)/target/aarch64-apple-ios/${CONFIGURATION}/deps/libpomatez.a + - $(SRCROOT)/target/x86_64-apple-ios/${CONFIGURATION}/deps/libpomatez.a \ No newline at end of file diff --git a/app/tauri/src/lib.rs b/app/tauri/src/lib.rs new file mode 100644 index 00000000..709dc40d --- /dev/null +++ b/app/tauri/src/lib.rs @@ -0,0 +1,52 @@ + + +#[cfg(debug_assertions)] +use tauri::{Manager}; +use tauri::{RunEvent}; +use tauri_plugin_autostart::MacosLauncher; +use tauri_plugin_window; + +#[macro_use] +mod commands; +mod system_tray; +mod global_shortcuts; +mod updater; + +use commands::PomatezCommands; +use system_tray::PomatezTray; +use global_shortcuts::{PomatezGlobalShortcutsSetup, PomatezGlobalShortcutsRegister}; + +#[cfg_attr(mobile, tauri::mobile_entry_point)] +pub fn run() { + let app = tauri::Builder::default() + .plugin(tauri_plugin_autostart::init(MacosLauncher::LaunchAgent, None)) + .plugin(tauri_plugin_window::init()) + .plugin(tauri_plugin_shell::init()) + .plugin(tauri_plugin_notification::init()) + .plugin(tauri_plugin_updater::Builder::new().build()) + .register_pomatez_commands() + .setup(|app| { + #[cfg(desktop)] + { + app.setup_global_shortcuts(); + app.set_pomatez_system_tray(); + } + + Ok(()) + }) + .build(tauri::generate_context!()) + .expect("error while running tauri application"); + + app.run(|app_handle, e| match e { + RunEvent::Ready => { + #[cfg(desktop)] + app_handle.register_global_shortcuts(); + + #[cfg(debug_assertions)] + app_handle.get_window("main").unwrap().open_devtools(); + + println!("Pomatez is ready"); + } + _ => {} + }); +} \ No newline at end of file diff --git a/app/tauri/src/main.rs b/app/tauri/src/main.rs index d8c81c24..a58c3a46 100644 --- a/app/tauri/src/main.rs +++ b/app/tauri/src/main.rs @@ -3,52 +3,6 @@ all(not(debug_assertions), target_os = "windows"), windows_subsystem = "windows" )] -#[cfg(debug_assertions)] -use tauri::{Manager}; -use tauri::{RunEvent}; -use tauri_plugin_autostart::MacosLauncher; -use tauri_plugin_window; - -#[macro_use] -mod commands; -mod system_tray; -mod global_shortcuts; -mod updater; - -use commands::PomatezCommands; -use system_tray::PomatezTray; -use global_shortcuts::{PomatezGlobalShortcutsSetup, PomatezGlobalShortcutsRegister}; - fn main() { - let app = tauri::Builder::default() - .plugin(tauri_plugin_autostart::init(MacosLauncher::LaunchAgent, None)) - .plugin(tauri_plugin_window::init()) - .plugin(tauri_plugin_shell::init()) - .plugin(tauri_plugin_notification::init()) - .plugin(tauri_plugin_updater::Builder::new().build()) - .register_pomatez_commands() - .setup(|app| { - #[cfg(desktop)] - { - app.setup_global_shortcuts(); - app.set_pomatez_system_tray(); - } - - Ok(()) - }) - .build(tauri::generate_context!()) - .expect("error while running tauri application"); - - app.run(|app_handle, e| match e { - RunEvent::Ready => { - #[cfg(desktop)] - app_handle.register_global_shortcuts(); - - #[cfg(debug_assertions)] - app_handle.get_window("main").unwrap().open_devtools(); - - println!("Pomatez is ready"); - } - _ => {} - }); -} + pomatez_lib::run() +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index b4065434..8fd9a0aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14930,10 +14930,10 @@ react-dom@^16.14.0: prop-types "^15.6.2" scheduler "^0.19.1" -react-error-overlay@^6.0.11: - version "6.0.11" - resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb" - integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg== +react-error-overlay@6.0.9, react-error-overlay@^6.0.11: + version "6.0.9" + resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" + integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew== react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.6: version "16.13.1"