Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix @rpath/libswiftCore.dylib error + etc #255

Merged
merged 1 commit into from Jun 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
81 changes: 59 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apps/desktop/package.json
Expand Up @@ -15,12 +15,12 @@
"@sd/core": "workspace:*",
"@sd/interface": "workspace:*",
"@sd/ui": "workspace:*",
"@tauri-apps/api": "1.0.0-rc.6",
"@tauri-apps/api": "1.0.0",
"react": "^18.1.0",
"react-dom": "^18.1.0"
},
"devDependencies": {
"@tauri-apps/cli": "1.0.0-rc.13",
"@tauri-apps/cli": "1.0.0",
"@tauri-apps/tauricon": "github:tauri-apps/tauricon",
"@types/babel-core": "^6.25.7",
"@types/byte-size": "^8.1.0",
Expand Down
4 changes: 2 additions & 2 deletions apps/desktop/src-tauri/Cargo.toml
Expand Up @@ -10,11 +10,11 @@ edition = "2021"
build = "build.rs"

[build-dependencies]
tauri-build = { version = "1.0.0-rc.5", features = [] }
tauri-build = { version = "1.0.0", features = [] }

[dependencies]
# Project dependencies
tauri = { version = "1.0.0-rc.6", features = ["api-all", "macos-private-api"] }
tauri = { version = "1.0.0", features = ["api-all", "macos-private-api"] }
sdcore = { path = "../../../core" }
# tauri-plugin-shadows = { git = "https://github.com/tauri-apps/tauri-plugin-shadows", features = ["tauri-impl"] }

Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/build.rs
Expand Up @@ -3,7 +3,7 @@ fn main() {
{
use swift_rs::build::{link_swift, link_swift_package};

link_swift();
link_swift("10.15"); // macOS Catalina. Earliest version that is officially supported by Apple.
link_swift_package("sd-desktop-macos", "./native/macos/");
}

Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/native/macos/Package.resolved
Expand Up @@ -6,7 +6,7 @@
"repositoryURL": "https://github.com/brendonovich/swift-rs.git",
"state": {
"branch": "autorelease",
"revision": "fe5a1c2f668e6bade43d6f56e2530f110055cee9",
"revision": "b16ba936ca2330bb27c6b9b7a84ad0d583ef0caa",
"version": null
}
}
Expand Down
4 changes: 2 additions & 2 deletions apps/desktop/src-tauri/native/macos/Package.swift
Expand Up @@ -6,8 +6,8 @@ import PackageDescription
let package = Package(
name: "sd-desktop-macos",
platforms: [
.macOS(.v11)
],
.macOS(.v10_15), // macOS Catalina. Earliest version that is officially supported by Apple.
],
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(
Expand Down
7 changes: 5 additions & 2 deletions apps/desktop/src-tauri/tauri.conf.json
Expand Up @@ -14,7 +14,7 @@
"bundle": {
"active": true,
"targets": "all",
"identifier": "app.spacedrive.desktop",
"identifier": "com.spacedrive.desktop",
"icon": [
"icons/32x32.png",
"icons/128x128.png",
Expand All @@ -32,7 +32,7 @@
},
"macOS": {
"frameworks": [],
"minimumSystemVersion": "",
"minimumSystemVersion": "10.15",
"exceptionDomain": "",
"signingIdentity": null,
"entitlements": null
Expand All @@ -51,6 +51,9 @@
"protocol": {
"assetScope": ["*"]
},
"os": {
"all": true
},
"dialog": {
"all": true,
"open": true,
Expand Down
18 changes: 12 additions & 6 deletions apps/desktop/src-tauri/tauri.linux.conf.json
Expand Up @@ -10,10 +10,11 @@
"beforeBuildCommand": "pnpm exec vite build"
},
"tauri": {
"macOSPrivateApi": true,
"bundle": {
"active": true,
"targets": "all",
"identifier": "co.spacedrive.desktop",
"identifier": "com.spacedrive.desktop",
"icon": ["icons/icon.icns"],
"resources": [],
"externalBin": [],
Expand All @@ -25,7 +26,7 @@
},
"macOS": {
"frameworks": [],
"minimumSystemVersion": "",
"minimumSystemVersion": "10.14",
"exceptionDomain": "",
"signingIdentity": null,
"entitlements": null
Expand All @@ -41,6 +42,9 @@
},
"allowlist": {
"all": true,
"protocol": {
"assetScope": ["*"]
},
"os": {
"all": true
},
Expand All @@ -53,15 +57,17 @@
"windows": [
{
"title": "Spacedrive",
"width": 1250,
"height": 625,
"width": 1200,
"height": 725,
"minWidth": 700,
"minHeight": 500,
"resizable": true,
"fullscreen": false,
"alwaysOnTop": false,
"focus": true,
"focus": false,
"fileDropEnabled": false,
"decorations": true,
"transparent": false,
"transparent": true,
"center": true
}
],
Expand Down
1 change: 0 additions & 1 deletion apps/landing/src/vite-env.d.ts
@@ -1,5 +1,4 @@
/// <reference types="vite/client" />
/// <reference types="vite-plugin-pages/client-react" />

interface ImportMetaEnv {
readonly VITE_SDWEB_BASE_URL: string;
Expand Down
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -25,7 +25,8 @@
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^3.2.0",
"prettier": "^2.6.2",
"turbo": "^1.2.14"
"turbo": "^1.2.14",
"typescript": "^4.7.4"
},
"overrides": {
"vite-plugin-svgr": "https://github.com/spacedriveapp/vite-plugin-svgr#cb4195b69849429cdb18d1f12381676bf9196a84"
Expand Down
2 changes: 1 addition & 1 deletion packages/interface/src/hooks/useCoreEvents.tsx
Expand Up @@ -3,7 +3,7 @@ import { CoreEvent } from '@sd/core';
import { useContext, useEffect } from 'react';
import { useQueryClient } from 'react-query';

import { AppPropsContext } from '../App';
import { AppPropsContext } from '../AppPropsContext';
import { useExplorerState } from './useExplorerState';

export function useCoreEvents() {
Expand Down
4 changes: 2 additions & 2 deletions packages/macos/Package.resolved
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/Brendonovich/swift-rs",
"state": {
"branch": null,
"revision": "7e856764418a5ea2b452146e8c6c65937f32e2e3",
"version": "0.2.3"
"revision": "e47a9e8186f6e25be6fae40d3cc3c272abea63a2",
"version": "0.3.0"
}
}
]
Expand Down