Skip to content

Commit

Permalink
Merge branch 'release-candidate' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
yarneo committed Dec 15, 2017
2 parents dc14ee2 + 18b571c commit 1387294
Show file tree
Hide file tree
Showing 22 changed files with 180 additions and 552 deletions.
23 changes: 0 additions & 23 deletions .arcconfig

This file was deleted.

24 changes: 0 additions & 24 deletions .arclint

This file was deleted.

9 changes: 0 additions & 9 deletions .arcunit

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
docs/
bazel-*
.kokoro-ios-runner

# Xcode
#
Expand Down
9 changes: 0 additions & 9 deletions .gitmodules

This file was deleted.

18 changes: 9 additions & 9 deletions .kokoro
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

# Fail on any error.
set -e
# Display commands to stderr.
set -x

gem install xcpretty --no-rdoc --no-ri --no-document --quiet
if [ ! -d .kokoro-ios-runner ]; then
git clone https://github.com/material-foundation/kokoro-ios-runner.git .kokoro-ios-runner
fi

sudo xcode-select --switch /Applications/Xcode_8.2.app/Contents/Developer
xcodebuild -version
pushd .kokoro-ios-runner
git fetch > /dev/null
git checkout v2.1.1 > /dev/null
popd

cd github/repo
xcodebuild clean build -project CatalogByConvention/CatalogByConvention.xcodeproj -sdk "iphonesimulator" | xcpretty
./.kokoro-ios-runner/bazel.sh //:CatalogByConvention

# Enable this if and when we have unit tests.
#bash <(curl -s https://codecov.io/bash)
echo "Success!"
39 changes: 39 additions & 0 deletions BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Description:
# Tools for building a Catalog by Convention.

licenses(["notice"]) # Apache 2.0

exports_files(["LICENSE"])

objc_library(
name = "CatalogByConvention",
srcs = glob([
"src/*.m",
"src/private/*.m",
]),
hdrs = glob([
"src/*.h",
"src/private/*.h",
]),
includes = ["src"],
visibility = ["//visibility:public"],
copts = [
"-Wall", # Standard known-to-be-bugs warnings.
"-Wcast-align", # Casting a pointer such that alignment is broken.
"-Wconversion", # Numeric conversion warnings.
"-Wdocumentation", # Documentation checks.
"-Werror", # All warnings as errors.
"-Wextra", # Many useful extra warnings.
"-Wimplicit-atomic-properties", # Dynamic properties should be non-atomic.
"-Wmissing-prototypes", # Global function is defined without a previous prototype.
"-Wno-error=deprecated", # Deprecation warnings are never errors.
"-Wno-error=deprecated-implementations", # Deprecation warnings are never errors.
"-Wno-sign-conversion", # Do not warn on sign conversions.
"-Wno-unused-parameter", # Do not warn on unused parameters.
"-Woverlength-strings", # Strings longer than the C maximum.
"-Wshadow", # Local variable shadows another variable, parameter, etc.
"-Wstrict-selector-match", # Compiler can't figure out the right selector.
"-Wundeclared-selector", # Compiler doesn't see a selector.
"-Wunreachable-code", # Code will never be reached.
]
)
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
# 2.3.0

This minor release adds two new functionalities that support our new Dragons app.

## New features

It's now possible to call `CBCCreatePresentableNavigationTree` to create a navigation tree that only consists of examples that implement the `catalogIsPresentable` method and return `YES` to it.
`CBCNode` now has a new property called `debugLeaf` which is also a `CBCNode`. If an example implements the `catalogIsDebug` method and returns `YES`, then that example will become the
`debugLeaf`. When the `debugLeaf` is set, then in the Dragons app it will become the initial view controller in the navigation. NOTE: If there are multiple examples that return `YES` to
`catalogIsDebug` then the last class that is parsed while going through the hierarchy is the one to be set as the `debugLeaf`.

## Source changes

* [Additional functionality to CbC to support Dragons (#19)](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/67c6d97e80c465d5915dc6dff4c6c19f53627bb8) (Yarden Eitan)

## Non-source changes

* [Remove arc support. (#18)](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/1fcaf777143b7906958b1cccc3a861320c45ce36) (featherless)
* [Bump the kokoro runner version to v2.1.1.](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/a49bf18bc839f86879473329a85f7939e0b115c8) (Jeff Verkoeyen)
* [Replace Carthage support with bazel support (#17)](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/dc45a1a6ef5ad92325ee2799b76920375141dacc) (featherless)

# 2.2.0

This minor release introduces support for Carthage.
Expand Down
2 changes: 1 addition & 1 deletion CatalogByConvention.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "CatalogByConvention"
s.version = "2.2.0"
s.version = "2.3.0"
s.authors = "Google Inc."
s.summary = "Tools for building a Catalog by Convention."
s.homepage = "https://github.com/material-foundation/cocoapods-catalog-by-convention"
Expand Down
Loading

0 comments on commit 1387294

Please sign in to comment.