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

Claim official iPadOS support #641

Merged
merged 1 commit into from
May 25, 2020
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions .github/workflows/test-objc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ env:
WITH_FATAL_WARNINGS: yes
# See here for what devices are available:
# https://github.com/actions/virtual-environments/blob/master/images/macos/
TEST_DEVICE: iPhone 8
TEST_IPHONE: iPhone 8
TEST_IPAD: iPad Pro (9.7-inch)
# Most of our tests and examples are actually Xcode projects which integrate
# Themis via a dependency manager (Carthage, CocoaPods). This means that they
# depend on the current stable version, and that's what they will pull in.
Expand Down Expand Up @@ -91,7 +92,7 @@ jobs:
-workspace objcthemis.xcworkspace \
-scheme "objthemis" \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=${TEST_DEVICE}" \
-destination "platform=iOS Simulator,name=${TEST_IPHONE}" \
test
- name: Run unit tests (iOS Simulator, BoringSSL)
if: always()
Expand All @@ -103,7 +104,7 @@ jobs:
-workspace objcthemis.xcworkspace \
-scheme "objthemis_boring" \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=${TEST_DEVICE}" \
-destination "platform=iOS Simulator,name=${TEST_IPAD}" \
test

unit-tests-carthage:
Expand Down Expand Up @@ -141,7 +142,7 @@ jobs:
-project ObjCThemis.xcodeproj \
-scheme "Test Themis (Swift 4, iOS)" \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=${TEST_DEVICE}" \
-destination "platform=iOS Simulator,name=${TEST_IPAD}" \
test
- name: Run unit tests (Swift 5, iOS Simulator)
if: always()
Expand All @@ -152,7 +153,7 @@ jobs:
-project ObjCThemis.xcodeproj \
-scheme "Test Themis (Swift 5, iOS)" \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=${TEST_DEVICE}" \
-destination "platform=iOS Simulator,name=${TEST_IPHONE}" \
test

project-carthage:
Expand Down Expand Up @@ -249,7 +250,7 @@ jobs:
-project ThemisTest.xcodeproj \
-scheme "ThemisTest" \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=${TEST_DEVICE}" \
-destination "platform=iOS Simulator,name=${TEST_IPAD}" \
build
- name: Build sample app (Objective-C, Carthage, macOS)
if: always()
Expand All @@ -273,7 +274,7 @@ jobs:
-workspace ThemisTest.xcworkspace \
-scheme "ThemisTest" \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=${TEST_DEVICE}" \
-destination "platform=iOS Simulator,name=${TEST_IPHONE}" \
build
#
# App samples: Swift
Expand All @@ -289,7 +290,7 @@ jobs:
-project ThemisTest.xcodeproj \
-scheme "ThemisTest" \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=${TEST_DEVICE}" \
-destination "platform=iOS Simulator,name=${TEST_IPHONE}" \
build
- name: Build sample app (Swift, Carthage, macOS)
if: always()
Expand All @@ -313,7 +314,7 @@ jobs:
-workspace ThemisSwift.xcworkspace \
-scheme "ThemisSwift" \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=${TEST_DEVICE}" \
-destination "platform=iOS Simulator,name=${TEST_IPAD}" \
build
#
# Themis server clients
Expand All @@ -329,7 +330,7 @@ jobs:
-workspace WorkingWithThemisServer.xcworkspace \
-scheme "WorkingWithThemisServer" \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=${TEST_DEVICE}" \
-destination "platform=iOS Simulator,name=${TEST_IPHONE}" \
build
- name: Build client for Themis Server (Swift)
if: always()
Expand All @@ -342,5 +343,5 @@ jobs:
-workspace SwiftThemisServerExample.xcworkspace \
-scheme "SwiftThemisServerExample" \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=${TEST_DEVICE}" \
-destination "platform=iOS Simulator,name=${TEST_IPAD}" \
build
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ _Code:_
- **iOS and macOS**

- New function `TSGenerateSymmetricKey()` (available in Objective-C and Swift) can be used to generate symmetric keys for Secure Cell ([#561](https://github.com/cossacklabs/themis/pull/561)).
- iPadOS is now officially supported target for ObjCThemis
([#641](https://github.com/cossacklabs/themis/pull/641)).

- Secure Cell API updates:

Expand Down Expand Up @@ -683,6 +685,8 @@ _Infrastructure:_
- Automated benchmarking harness is now tracking Themis performance. See [`benches`](https://github.com/cossacklabs/themis/tree/master/benches/) ([#580](https://github.com/cossacklabs/themis/pull/580)).
- Added automated tests for all code samples in documentation, ensuring they are always up-to-date ([#600](https://github.com/cossacklabs/themis/pull/600)).
- All 13 supported platforms are verified on GitHub Actions, along with existing CircleCI and Bitrise tests ([#600](https://github.com/cossacklabs/themis/pull/600)).
- iPadOS is now officially supported target for ObjCThemis
([#641](https://github.com/cossacklabs/themis/pull/641)).
- Kotlin API of JavaThemis is now verified by all CI platforms
([#637](https://github.com/cossacklabs/themis/pull/637).
- New Makefile targets:
Expand Down
2 changes: 2 additions & 0 deletions ObjCThemis.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1568,6 +1568,7 @@
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
Expand Down Expand Up @@ -1605,6 +1606,7 @@
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.stanfy.WorkingWithThemisServer;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
Expand All @@ -541,6 +542,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.stanfy.WorkingWithThemisServer;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(PROJECT_NAME)/SwiftThemisServerExample-Bridging-Header.h";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
Expand All @@ -380,6 +381,7 @@
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(PROJECT_NAME)/SwiftThemisServerExample-Bridging-Header.h";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis.ThemisTest;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
Expand All @@ -380,6 +381,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis.ThemisTest;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
Expand All @@ -524,6 +525,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
Expand All @@ -381,6 +382,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(PROJECT_NAME)/ThemisSwift-Bridging-Header.h";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
Expand All @@ -452,6 +453,7 @@
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(PROJECT_NAME)/ThemisSwift-Bridging-Header.h";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
Expand Down