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

Commit d300ae8

Browse files
author
Jeff Verkoeyen
committed
Merge branch 'release-candidate' into stable
2 parents 5df8310 + 5ecc1d1 commit d300ae8

14 files changed

+134
-108
lines changed

‎.jazzy.yaml‎

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

‎.kokoro‎

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -20,47 +20,44 @@ set -e
2020
# Display commands to stderr.
2121
set -x
2222

23-
KOKORO_RUNNER_VERSION="v4.*"
24-
25-
POSITIONAL=()
26-
while [[ $# -gt 0 ]]; do
27-
key="$1"
28-
29-
case $key in
30-
-v|--verbose)
31-
VERBOSE_OUTPUT="1"
32-
shift
33-
;;
34-
*)
35-
POSITIONAL+=("$1")
36-
shift
37-
;;
38-
esac
39-
done
40-
set -- "${POSITIONAL[@]}" # restore positional parameters
41-
42-
if [ -n "$KOKORO_BUILD_NUMBER" ]; then
43-
# Always enable verbose output on kokoro runs.
44-
VERBOSE_OUTPUT=1
45-
fi
46-
47-
if [ -n "$VERBOSE_OUTPUT" ]; then
48-
# Display commands to stderr.
49-
set -x
50-
verbosity_args="-v"
51-
fi
52-
53-
if [ ! -d .kokoro-ios-runner ]; then
54-
git clone https://github.com/material-foundation/kokoro-ios-runner.git .kokoro-ios-runner
55-
fi
56-
57-
pushd .kokoro-ios-runner
58-
git fetch > /dev/null
59-
# https://stackoverflow.com/questions/21394536/how-to-simulate-sort-v-on-mac-osx
60-
TAG=$(git tag --sort=v:refname -l "$KOKORO_RUNNER_VERSION" | tail -n1)
61-
git checkout "$TAG" > /dev/null
62-
popd
63-
64-
./.kokoro-ios-runner/bazel.sh test //:UnitTests --min-xcode-version 8.1.0 $verbosity_args
23+
BAZEL_VERSION="0.20.0"
24+
IOS_MINIMUM_OS="8.0"
25+
IOS_CPUS="i386,x86_64"
26+
27+
get_xcode_version_from_path() {
28+
path="$1"
29+
cat "$path/version.plist" \
30+
| grep "CFBundleShortVersionString" -A1 \
31+
| grep string \
32+
| cut -d'>' -f2 \
33+
| cut -d'<' -f1
34+
}
35+
36+
run_bazel() {
37+
echo "Running bazel builds..."
38+
39+
if [ -n "$KOKORO_BUILD_NUMBER" ]; then
40+
bazel version
41+
use_bazel.sh "$BAZEL_VERSION"
42+
bazel version
43+
44+
# Move into our cloned repo
45+
cd github/repo
46+
fi
47+
48+
# Run against whichever Xcode is currently selected.
49+
selected_xcode_developer_path=$(xcode-select -p)
50+
selected_xcode_contents_path=$(dirname "$selected_xcode_developer_path")
51+
52+
xcode_version=$(get_xcode_version_from_path "$selected_xcode_contents_path")
53+
54+
bazel clean
55+
bazel test //... \
56+
--xcode_version "$xcode_version" \
57+
--ios_minimum_os="$IOS_MINIMUM_OS" \
58+
--ios_multi_cpus="$IOS_CPUS"
59+
}
60+
61+
run_bazel
6562

6663
echo "Success!"

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
language: objective-c
2-
osx_image: xcode9.2
32
sudo: false
43
env:
54
global:

‎BUILD‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
# Description:
1616
# A Motion Animator creates performant, interruptible animations from motion specs.
1717

18+
load("@build_bazel_rules_apple//apple:ios.bzl", "ios_ui_test")
19+
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
1820
load("@bazel_ios_warnings//:strict_warnings_objc_library.bzl", "strict_warnings_objc_library")
19-
load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
20-
load("@build_bazel_rules_apple//apple:swift.bzl", "swift_library")
2121

2222
licenses(["notice"]) # Apache 2.0
2323

@@ -70,12 +70,14 @@ objc_library(
7070
visibility = ["//visibility:private"],
7171
)
7272

73-
ios_unit_test(
73+
ios_ui_test(
7474
name = "UnitTests",
7575
deps = [
7676
":UnitTestsLib",
7777
":UnitTestsSwiftLib"
7878
],
79+
test_host = "@build_bazel_rules_apple//apple/testing/default_host/ios",
80+
minimum_os_version = "8.0",
7981
timeout = "short",
8082
visibility = ["//visibility:private"],
8183
)

‎CHANGELOG.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
# 3.0.0
2+
3+
This major release upgrades the bazel dependencies and workspace. This change is breaking for anyone
4+
using bazel to build this library. In order to use this library with bazel, you will also need to
5+
upgrade your workspace versions to match the ones now used in this library's `WORKSPACE` file.
6+
7+
## Source changes
8+
9+
* [Make tests more robust to crashing failures. (#118)](https://github.com/material-motion/motion-animator-objc/commit/d2f5971a554d2e63b74a3ad7d36cd9b7ed7823ca) (featherless)
10+
11+
## Non-source changes
12+
13+
* [Automatic changelog preparation for release.](https://github.com/material-motion/motion-animator-objc/commit/2f7d3af5fd9cf6bdcb88e0b955e7ceb903dc9b22) (Jeff Verkoeyen)
14+
* [Update bazel workspace to latest versions. (#120)](https://github.com/material-motion/motion-animator-objc/commit/e28f79e51bbfa7a41d7c9941e7a0ba7beaaa05ff) (featherless)
15+
* [Don't animate system views with the animator. (#119)](https://github.com/material-motion/motion-animator-objc/commit/c8057832a9f961585978d59a7ea03e8f641d8ae6) (featherless)
16+
* [Update .travis.yml](https://github.com/material-motion/motion-animator-objc/commit/e839e817c80aa8df34faacf7fe95d6fb1d508643) (featherless)
17+
* [Update .kokoro](https://github.com/material-motion/motion-animator-objc/commit/4eed01c25d7fd84fe9e48f147f195987ebbf26e9) (featherless)
18+
* [Update .kokoro](https://github.com/material-motion/motion-animator-objc/commit/55dd1b14f243418bf4d4fe4ea0eb0a6bcfbb88de) (featherless)
19+
* [Update bazel workspace and version to latest. (#117)](https://github.com/material-motion/motion-animator-objc/commit/b8261f30f3437c75e8bc1b9f25c074304acc43b5) (featherless)
20+
121
# 2.8.1
222

323
This patch release resolves some runtime crashes, improves the stability of our unit tests, and features an improved README.md.

‎MotionAnimator.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "MotionAnimator"
33
s.summary = "A Motion Animator creates performant, interruptible animations from motion specs."
4-
s.version = "2.8.1"
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-animator-objc"
@@ -12,5 +12,5 @@ Pod::Spec.new do |s|
1212
s.public_header_files = "src/*.h"
1313
s.source_files = "src/*.{h,m,mm}", "src/private/*.{h,m,mm}"
1414

15-
s.dependency "MotionInterchange", "~> 1.6"
15+
s.dependency "MotionInterchange", "~> 2.0"
1616
end

‎Podfile.lock‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
PODS:
2-
- CatalogByConvention (2.4.1)
2+
- CatalogByConvention (2.5.1)
33
- MotionAnimator (2.8.1):
4-
- MotionInterchange (~> 1.6)
5-
- MotionInterchange (1.6.0)
4+
- MotionInterchange (~> 2.0)
5+
- MotionInterchange (2.0.0)
66

77
DEPENDENCIES:
88
- CatalogByConvention
99
- MotionAnimator (from `./`)
1010

11+
SPEC REPOS:
12+
https://github.com/cocoapods/specs.git:
13+
- CatalogByConvention
14+
- MotionInterchange
15+
1116
EXTERNAL SOURCES:
1217
MotionAnimator:
13-
:path: ./
18+
:path: "./"
1419

1520
SPEC CHECKSUMS:
16-
CatalogByConvention: 16cd56d7e75b816e4eda0d62f9c5f0c82da8baff
17-
MotionAnimator: 07399ec033ab44256276d71037402413922fbb89
18-
MotionInterchange: ead0e3ae1f3a5fb539e289debbc7ae036160a10d
21+
CatalogByConvention: 2b58a9b64e5b1049abb5d3f8e764a551bbe843a7
22+
MotionAnimator: ab78e3a6eb59f1061c2c00dd09dc923f254f4a61
23+
MotionInterchange: 5b7325142e4af884278bab7adcd264976a8c0593
1924

2025
PODFILE CHECKSUM: 3537bf01c11174928ac008c20fec4738722e96f3
2126

22-
COCOAPODS: 1.4.0
27+
COCOAPODS: 1.5.3

‎WORKSPACE‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,49 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
16+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
17+
1518
git_repository(
1619
name = "build_bazel_rules_apple",
1720
remote = "https://github.com/bazelbuild/rules_apple.git",
18-
commit = "7ea0557",
21+
tag = "0.9.0",
22+
)
23+
24+
load(
25+
"@build_bazel_rules_apple//apple:repositories.bzl",
26+
"apple_rules_dependencies",
27+
)
28+
29+
apple_rules_dependencies()
30+
31+
git_repository(
32+
name = "build_bazel_rules_swift",
33+
remote = "https://github.com/bazelbuild/rules_swift.git",
34+
tag = "0.4.0",
35+
)
36+
37+
load(
38+
"@build_bazel_rules_swift//swift:repositories.bzl",
39+
"swift_rules_dependencies",
1940
)
2041

42+
swift_rules_dependencies()
43+
2144
git_repository(
2245
name = "bazel_ios_warnings",
2346
remote = "https://github.com/material-foundation/bazel_ios_warnings.git",
24-
tag = "v1.0.1",
47+
tag = "v2.0.0",
2548
)
2649

2750
git_repository(
2851
name = "motion_interchange_objc",
2952
remote = "https://github.com/material-motion/motion-interchange-objc.git",
30-
tag = "v1.6.0",
53+
commit = "v2.0.0",
54+
)
55+
56+
http_file(
57+
name = "xctestrunner",
58+
executable = 1,
59+
urls = ["https://github.com/google/xctestrunner/releases/download/0.2.5/ios_test_runner.par"],
3160
)

‎examples/CalendarCardExpansionExample.m‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ - (void)didTap {
4848
animator.shouldReverseValues = !_expanded;
4949
animator.beginFromCurrentState = YES;
5050

51-
[animator animateWithTraits:traits.navigationBarY animations:^{
52-
[self.navigationController setNavigationBarHidden:_expanded animated:YES];
53-
}];
51+
[self.navigationController setNavigationBarHidden:_expanded animated:YES];
5452

5553
CGRect chipFrame = [self frameForChip];
5654
CGRect headerFrame = [self frameForHeader];

‎examples/CalendarChipMotionSpec.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
@property(nonatomic, strong, nonnull, readonly) MDMAnimationTraits *chipContentOpacity;
2727
@property(nonatomic, strong, nonnull, readonly) MDMAnimationTraits *headerContentOpacity;
2828

29-
@property(nonatomic, strong, nonnull, readonly) MDMAnimationTraits *navigationBarY;
30-
3129
@end
3230

3331
@interface CalendarChipMotionSpec: NSObject

0 commit comments

Comments
 (0)