fix ci
This commit is contained in:
parent
caff6a175d
commit
4483b815f6
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -72,7 +72,7 @@ jobs:
|
||||||
args: --example ios-beta --no-default-features --features uikit,autolayout
|
args: --example ios-beta --no-default-features --features uikit,autolayout
|
||||||
|
|
||||||
ios:
|
ios:
|
||||||
name: Check that examples build
|
name: Check that iOS tests pass via dinghy.
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
use objc::runtime::{Object, Class};
|
use objc::runtime::{Class, Object};
|
||||||
use objc_id::ShareId;
|
use objc_id::ShareId;
|
||||||
|
|
||||||
use objc::{class, msg_send, sel, sel_impl};
|
use objc::{class, msg_send, sel, sel_impl};
|
||||||
|
|
|
@ -5,10 +5,10 @@ use objc::runtime::{Class, Object, Sel, BOOL};
|
||||||
use objc::{class, sel, sel_impl};
|
use objc::{class, sel, sel_impl};
|
||||||
use objc_id::Id;
|
use objc_id::Id;
|
||||||
|
|
||||||
use crate::foundation::{id, YES, NO, NSUInteger};
|
|
||||||
use crate::dragdrop::DragInfo;
|
use crate::dragdrop::DragInfo;
|
||||||
use crate::view::{VIEW_DELEGATE_PTR, ViewDelegate};
|
use crate::foundation::{id, NSUInteger, NO, YES};
|
||||||
use crate::utils::load;
|
use crate::utils::load;
|
||||||
|
use crate::view::{ViewDelegate, VIEW_DELEGATE_PTR};
|
||||||
|
|
||||||
/// Injects an `NSView` subclass. This is used for the default views that don't use delegates - we
|
/// Injects an `NSView` subclass. This is used for the default views that don't use delegates - we
|
||||||
/// have separate classes here since we don't want to waste cycles on methods that will never be
|
/// have separate classes here since we don't want to waste cycles on methods that will never be
|
||||||
|
|
|
@ -103,7 +103,6 @@ impl LayoutConstraint {
|
||||||
pub fn activate(constraints: &[LayoutConstraint]) {
|
pub fn activate(constraints: &[LayoutConstraint]) {
|
||||||
let ids: Vec<&Object> = constraints.into_iter().map(|constraint| &*constraint.constraint).collect();
|
let ids: Vec<&Object> = constraints.into_iter().map(|constraint| &*constraint.constraint).collect();
|
||||||
unsafe {
|
unsafe {
|
||||||
|
|
||||||
let constraints: id = msg_send![class!(NSArray), arrayWithObjects:ids.as_ptr() count:ids.len()];
|
let constraints: id = msg_send![class!(NSArray), arrayWithObjects:ids.as_ptr() count:ids.len()];
|
||||||
let _: () = msg_send![class!(NSLayoutConstraint), activateConstraints: constraints];
|
let _: () = msg_send![class!(NSLayoutConstraint), activateConstraints: constraints];
|
||||||
}
|
}
|
||||||
|
@ -112,7 +111,6 @@ impl LayoutConstraint {
|
||||||
pub fn deactivate(constraints: &[LayoutConstraint]) {
|
pub fn deactivate(constraints: &[LayoutConstraint]) {
|
||||||
let ids: Vec<&Object> = constraints.into_iter().map(|constraint| &*constraint.constraint).collect();
|
let ids: Vec<&Object> = constraints.into_iter().map(|constraint| &*constraint.constraint).collect();
|
||||||
unsafe {
|
unsafe {
|
||||||
|
|
||||||
let constraints: id = msg_send![class!(NSArray), arrayWithObjects:ids.as_ptr() count:ids.len()];
|
let constraints: id = msg_send![class!(NSArray), arrayWithObjects:ids.as_ptr() count:ids.len()];
|
||||||
let _: () = msg_send![class!(NSLayoutConstraint), deactivateConstraints: constraints];
|
let _: () = msg_send![class!(NSLayoutConstraint), deactivateConstraints: constraints];
|
||||||
}
|
}
|
||||||
|
|
|
@ -143,8 +143,6 @@ pub mod image;
|
||||||
#[cfg(feature = "appkit")]
|
#[cfg(feature = "appkit")]
|
||||||
pub mod input;
|
pub mod input;
|
||||||
pub(crate) mod invoker;
|
pub(crate) mod invoker;
|
||||||
#[cfg(test)]
|
|
||||||
mod tests;
|
|
||||||
|
|
||||||
pub mod keys;
|
pub mod keys;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue