Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit 8e25f1c

Browse files
author
featherless
committed
Merge branch 'release-candidate' into stable
2 parents 6c38539 + 8dcbe8d commit 8e25f1c

File tree

8 files changed

+18
-49
lines changed

8 files changed

+18
-49
lines changed

.jazzy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module: MotionInterchange
2-
module_version: 2.0.0
2+
module_version: 3.0.0
33
sdk: iphonesimulator
44
umbrella_header: src/MotionInterchange.h
55
objc: true
66
github_url: https://github.com/material-motion/motion-interchange-objc
7-
github_file_prefix: https://github.com/material-motion/motion-interchange-objc/tree/v2.0.0
7+
github_file_prefix: https://github.com/material-motion/motion-interchange-objc/tree/v3.0.0
88

.kokoro

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,8 @@ set -e
2020
# Display commands to stderr.
2121
set -x
2222

23-
KOKORO_RUNNER_VERSION="v4.*"
2423
BAZEL_VERSION="0.20.0"
2524

26-
# xcode-select's the provided xcode version.
27-
# Usage example:
28-
# select_xcode 9.2.0
29-
select_xcode() {
30-
desired_version="$1"
31-
if [ -z "$desired_version" ]; then
32-
return # No Xcode version to select.
33-
fi
34-
35-
xcodes=$(ls /Applications/ | grep "Xcode")
36-
for xcode_path in $xcodes; do
37-
xcode_version=$(cat /Applications/$xcode_path/Contents/version.plist \
38-
| grep "CFBundleShortVersionString" -A1 \
39-
| grep string \
40-
| cut -d'>' -f2 \
41-
| cut -d'<' -f1)
42-
xcode_version_as_number="$(version_as_number $xcode_version)"
43-
44-
if [ "$xcode_version_as_number" -ne "$(version_as_number $desired_version)" ]; then
45-
continue
46-
fi
47-
48-
sudo xcode-select --switch /Applications/$xcode_path/Contents/Developer
49-
xcodebuild -version
50-
51-
# Resolves the following crash when switching Xcode versions:
52-
# "Failed to locate a valid instance of CoreSimulatorService in the bootstrap"
53-
launchctl remove com.apple.CoreSimulator.CoreSimulatorService || true
54-
55-
break
56-
done
57-
}
58-
5925
fix_bazel_imports() {
6026
if [ -z "$KOKORO_BUILD_NUMBER" ]; then
6127
repo_prefix=""
@@ -83,8 +49,6 @@ run_bazel() {
8349
use_bazel.sh "$BAZEL_VERSION"
8450
bazel version
8551

86-
select_xcode "$XCODE_VERSION"
87-
8852
# Move into our cloned repo
8953
cd github/repo
9054
fi
@@ -100,7 +64,7 @@ run_bazel() {
10064
| cut -d'<' -f1)
10165

10266
bazel clean
103-
bazel test //... --xcode_version $xcode_version --ios_minimum_os=8.0 --ios_multi_cpus=i386,x86_64
67+
bazel test //... --xcode_version $xcode_version --ios_minimum_os=9.0 --ios_multi_cpus=i386,x86_64 --test_output=all
10468
}
10569

10670
run_bazel

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ matrix:
1414
env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=10.3.1"
1515
- osx_image: xcode9.2
1616
env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=9.3"
17-
- osx_image: xcode9.2
18-
env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6,OS=8.4"
19-
- osx_image: xcode8.3
20-
env: SDK="iphonesimulator10.3" DESTINATION="name=iPhone 6,OS=8.1"
2117
before_install:
2218
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
2319
- pod install

BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ios_ui_test(
7070
":UnitTestsSwiftLib"
7171
],
7272
test_host = "@build_bazel_rules_apple//apple/testing/default_host/ios",
73-
minimum_os_version = "8.0",
73+
minimum_os_version = "9.0",
7474
timeout = "short",
7575
visibility = ["//visibility:private"],
7676
)

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# 3.0.0
2+
3+
This major release drops official support for iOS 8.
4+
5+
## Non-source changes
6+
7+
* [Drop support for iOS 8 (#43)](https://github.com/material-motion/motion-interchange-objc/commit/31a6c576f752a132206c7b09412bd6a390052b88) (featherless)
8+
* [Remove the xcode_select logic. (#42)](https://github.com/material-motion/motion-interchange-objc/commit/9cd51bc492174aabfa99cd2d4d802f8f58a3239c) (featherless)
9+
110
# 2.0.0
211

312
This major release upgrades the bazel dependencies and workspace. This change is breaking for anyone

MotionInterchange.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22
s.name = "MotionInterchange"
33
s.summary = "Motion interchange format."
4-
s.version = "2.0.0"
4+
s.version = "3.0.0"
55
s.authors = "The Material Motion Authors"
66
s.license = "Apache 2.0"
77
s.homepage = "https://github.com/material-motion/motion-interchange-objc"
88
s.source = { :git => "https://github.com/material-motion/motion-interchange-objc.git", :tag => "v" + s.version.to_s }
9-
s.platform = :ios, "8.0"
9+
s.platform = :ios, "9.0"
1010
s.requires_arc = true
1111

1212
s.public_header_files = "src/*.h"

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ swift_rules_dependencies()
4444
git_repository(
4545
name = "bazel_ios_warnings",
4646
remote = "https://github.com/material-foundation/bazel_ios_warnings.git",
47-
tag = "v2.0.0",
47+
tag = "v3.0.0",
4848
)
4949

5050
http_file(

examples/apps/Catalog/MotionInterchangeCatalog.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@
596596
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
597597
GCC_WARN_UNUSED_FUNCTION = YES;
598598
GCC_WARN_UNUSED_VARIABLE = YES;
599-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
599+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
600600
MTL_ENABLE_DEBUG_INFO = YES;
601601
ONLY_ACTIVE_ARCH = YES;
602602
SDKROOT = iphoneos;
@@ -644,7 +644,7 @@
644644
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
645645
GCC_WARN_UNUSED_FUNCTION = YES;
646646
GCC_WARN_UNUSED_VARIABLE = YES;
647-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
647+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
648648
MTL_ENABLE_DEBUG_INFO = NO;
649649
SDKROOT = iphoneos;
650650
TARGETED_DEVICE_FAMILY = "1,2";

0 commit comments

Comments
 (0)