Skip to content

Commit 1387294

Browse files
committed
Merge branch 'release-candidate' into stable
2 parents dc14ee2 + 18b571c commit 1387294

22 files changed

+180
-552
lines changed

.arcconfig

Lines changed: 0 additions & 23 deletions
This file was deleted.

.arclint

Lines changed: 0 additions & 24 deletions
This file was deleted.

.arcunit

Lines changed: 0 additions & 9 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
docs/
2+
bazel-*
3+
.kokoro-ios-runner
24

35
# Xcode
46
#

.gitmodules

Lines changed: 0 additions & 9 deletions
This file was deleted.

.kokoro

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
# Fail on any error.
44
set -e
5-
# Display commands to stderr.
6-
set -x
75

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

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

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

16-
# Enable this if and when we have unit tests.
17-
#bash <(curl -s https://codecov.io/bash)
17+
echo "Success!"

BUILD

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Description:
2+
# Tools for building a Catalog by Convention.
3+
4+
licenses(["notice"]) # Apache 2.0
5+
6+
exports_files(["LICENSE"])
7+
8+
objc_library(
9+
name = "CatalogByConvention",
10+
srcs = glob([
11+
"src/*.m",
12+
"src/private/*.m",
13+
]),
14+
hdrs = glob([
15+
"src/*.h",
16+
"src/private/*.h",
17+
]),
18+
includes = ["src"],
19+
visibility = ["//visibility:public"],
20+
copts = [
21+
"-Wall", # Standard known-to-be-bugs warnings.
22+
"-Wcast-align", # Casting a pointer such that alignment is broken.
23+
"-Wconversion", # Numeric conversion warnings.
24+
"-Wdocumentation", # Documentation checks.
25+
"-Werror", # All warnings as errors.
26+
"-Wextra", # Many useful extra warnings.
27+
"-Wimplicit-atomic-properties", # Dynamic properties should be non-atomic.
28+
"-Wmissing-prototypes", # Global function is defined without a previous prototype.
29+
"-Wno-error=deprecated", # Deprecation warnings are never errors.
30+
"-Wno-error=deprecated-implementations", # Deprecation warnings are never errors.
31+
"-Wno-sign-conversion", # Do not warn on sign conversions.
32+
"-Wno-unused-parameter", # Do not warn on unused parameters.
33+
"-Woverlength-strings", # Strings longer than the C maximum.
34+
"-Wshadow", # Local variable shadows another variable, parameter, etc.
35+
"-Wstrict-selector-match", # Compiler can't figure out the right selector.
36+
"-Wundeclared-selector", # Compiler doesn't see a selector.
37+
"-Wunreachable-code", # Code will never be reached.
38+
]
39+
)

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
# 2.3.0
2+
3+
This minor release adds two new functionalities that support our new Dragons app.
4+
5+
## New features
6+
7+
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.
8+
`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
9+
`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
10+
`catalogIsDebug` then the last class that is parsed while going through the hierarchy is the one to be set as the `debugLeaf`.
11+
12+
## Source changes
13+
14+
* [Additional functionality to CbC to support Dragons (#19)](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/67c6d97e80c465d5915dc6dff4c6c19f53627bb8) (Yarden Eitan)
15+
16+
## Non-source changes
17+
18+
* [Remove arc support. (#18)](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/1fcaf777143b7906958b1cccc3a861320c45ce36) (featherless)
19+
* [Bump the kokoro runner version to v2.1.1.](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/a49bf18bc839f86879473329a85f7939e0b115c8) (Jeff Verkoeyen)
20+
* [Replace Carthage support with bazel support (#17)](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/dc45a1a6ef5ad92325ee2799b76920375141dacc) (featherless)
21+
122
# 2.2.0
223

324
This minor release introduces support for Carthage.

CatalogByConvention.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "CatalogByConvention"
3-
s.version = "2.2.0"
3+
s.version = "2.3.0"
44
s.authors = "Google Inc."
55
s.summary = "Tools for building a Catalog by Convention."
66
s.homepage = "https://github.com/material-foundation/cocoapods-catalog-by-convention"

0 commit comments

Comments
 (0)