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

Commit

Permalink
Merge branch 'release-candidate' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Verkoeyen committed Apr 5, 2021
2 parents 8e25f1c + ba7b6bf commit 657fd54
Show file tree
Hide file tree
Showing 16 changed files with 583 additions and 237 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,4 @@ fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
.DS_Store
15 changes: 6 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
language: objective-c
osx_image: xcode9.2
sudo: false
env:
global:
Expand All @@ -8,15 +7,13 @@ env:
- LANGUAGE=en_US.UTF-8
matrix:
include:
- osx_image: xcode9.2
env: COVERAGE=code_coverage SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=11.2"
- osx_image: xcode9.2
env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=10.3.1"
- osx_image: xcode9.2
env: SDK="iphonesimulator11.2" DESTINATION="name=iPhone 6s,OS=9.3"
- osx_image: xcode12.2
env: COVERAGE=code_coverage SDK="iphonesimulator14.2" DESTINATION="name=iPhone 6s,OS=11.4"
- osx_image: xcode12.2
env: SDK="iphonesimulator14.2" DESTINATION="name=iPhone 6s,OS=10.3.1"
before_install:
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
- pod install
- gem install cocoapods --no-document --quiet
- pod install --repo-update
script:
- set -o pipefail
- xcodebuild test -workspace MotionInterchange.xcworkspace -scheme MotionInterchangeCatalog -sdk "$SDK" -destination "$DESTINATION" -enableCodeCoverage YES ONLY_ACTIVE_ARCH=YES | xcpretty -c;
Expand Down
76 changes: 0 additions & 76 deletions BUILD

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 4.0.0

This major release drops official support for Bazel and iOS 9.

# 3.0.0

This major release drops official support for iOS 8.
Expand Down
22 changes: 22 additions & 0 deletions Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion MotionInterchange.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "MotionInterchange"
s.summary = "Motion interchange format."
s.version = "3.0.0"
s.version = "4.0.0"
s.authors = "The Material Motion Authors"
s.license = "Apache 2.0"
s.homepage = "https://github.com/material-motion/motion-interchange-objc"
Expand Down
Loading

0 comments on commit 657fd54

Please sign in to comment.