Skip to content
This repository was archived by the owner on Oct 14, 2021. It is now read-only.

Commit c8ac3e1

Browse files
author
Jeff Verkoeyen
committed
Merge branch 'release-candidate' into stable
2 parents 46603b9 + cf7ccb9 commit c8ac3e1

File tree

27 files changed

+1917
-17
lines changed

27 files changed

+1917
-17
lines changed

‎.arc-hooks/post-diff/arc-hook-github-issues‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.arcconfig‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
11
{
22
"load": [
3-
".arc-hooks/post-diff/arc-hook-github-issues",
4-
"third_party/arc-hook-conphig",
5-
"third_party/arc-proselint"
3+
"material-arc-tools/third_party/arc-hook-conphig",
4+
"material-arc-tools/third_party/arc-hook-github-issues",
5+
"material-arc-tools/third_party/arc-jazzy-linter",
6+
"material-arc-tools/third_party/arc-proselint",
7+
"material-arc-tools/third_party/arc-xcode-test-engine",
8+
"material-arc-tools/third_party/clang-format-linter"
69
],
710
"arcanist_configuration": "HookConphig",
811
"phabricator.uri": "http://codereview.cc/",
912
"arc.land.onto.default": "develop",
10-
"arc.feature.start.default": "origin/develop"
13+
"arc.feature.start.default": "origin/develop",
14+
"unit.xcode": {
15+
"build": {
16+
"workspace": "apple/diffreport.xcworkspace",
17+
"scheme": "UnitTests",
18+
"configuration": "Debug",
19+
"destination": "platform=macOS"
20+
},
21+
"coverage": {
22+
"product": "diffreportlib.framework/diffreportlib"
23+
}
24+
}
1125
}

‎.arclint‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
"chmod": {
44
"type": "chmod"
55
},
6+
"text": {
7+
"type": "text",
8+
"include": "(\\.(m|h|mm|md|swift)$)",
9+
"exclude": [
10+
"(/Pods/)"
11+
],
12+
"severity": {
13+
"3": "disabled",
14+
"5": "disabled"
15+
}
16+
},
617
"prose": {
718
"type": "prose",
819
"include": "(\\.(md)$)",
@@ -19,6 +30,15 @@
1930
"spelling": {
2031
"type": "spelling",
2132
"include": "(\\.(md)$)"
33+
},
34+
"clang-format": {
35+
"type": "clang-format",
36+
"include": "(\\.(m|h|mm)$)",
37+
"exclude": "(/Pods/)"
38+
},
39+
"jazzy": {
40+
"type": "jazzy",
41+
"include": "(src/[^\/]+?\\.(h|swift)$)"
2242
}
2343
}
2444
}

‎.arcunit‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"engines": {
3+
"xcode": {
4+
"type": "xcode-test-engine",
5+
"include": [
6+
"(\\.(m|h|mm|swift)$)",
7+
"(Podfile)"
8+
],
9+
"exclude": "(/Pods/)"
10+
}
11+
}
12+
}

‎.clang-format‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
BasedOnStyle: Google
2+
3+
AllowShortFunctionsOnASingleLine: Inline
4+
AllowShortIfStatementsOnASingleLine: false
5+
AllowShortLoopsOnASingleLine: false
6+
AlwaysBreakBeforeMultilineStrings: false
7+
BinPackParameters: false
8+
ColumnLimit: 0
9+
IndentWrappedFunctionNames: true
10+
ObjCSpaceBeforeProtocolList: true
11+
PointerBindsToType: false
12+
SortIncludes: true

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Build output
2+
build/

‎.gitmodules‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
[submodule "third_party/arc-proselint"]
2-
path = third_party/arc-proselint
3-
url = https://github.com/google/arc-proselint.git
4-
[submodule "third_party/arc-hook-conphig"]
5-
path = third_party/arc-hook-conphig
6-
url = https://github.com/material-foundation/arc-hook-conphig.git
7-
[submodule ".arc-hooks/post-diff/arc-hook-github-issues"]
8-
path = .arc-hooks/post-diff/arc-hook-github-issues
9-
url = https://github.com/material-foundation/arc-hook-github-issues.git
1+
[submodule "third_party/jardiff"]
2+
path = third_party/jardiff
3+
url = https://github.com/JakeWharton/jardiff.git

‎.travis.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
language: objective-c
2+
osx_image: xcode8
3+
sudo: false
4+
notifications:
5+
email: false
6+
before_install:
7+
- brew install sourcekitten
8+
- git clone https://github.com/phacility/arcanist.git
9+
- git clone https://github.com/phacility/libphutil.git
10+
- git clone --recursive https://github.com/material-foundation/material-arc-tools.git
11+
script:
12+
- set -o pipefail
13+
- arcanist/bin/arc unit --everything --trace
14+
after_success:
15+
- bash <(curl -s https://codecov.io/bash)

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# 1.0.0
2+
3+
Initial release.
4+
5+
Supports Swift, Objective-C, and Android API diff generation.

‎README.md‎

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,67 @@
1-
# API diff for Objective-C and Swift code
1+
# API diff
22

33
[![Build Status](https://travis-ci.org/material-motion/material-motion-apidiff.svg?branch=develop)](https://travis-ci.org/material-motion/material-motion-apidiff)
4+
[![codecov](https://codecov.io/gh/material-motion/material-motion-apidiff/branch/develop/graph/badge.svg)](https://codecov.io/gh/material-motion/material-motion-apidiff)
5+
6+
An API diff tool for Objective-C, Swift, and Android code that outputs markdown.
7+
8+
## Requirements
9+
10+
Engine for apple APIs requires:
11+
12+
- Xcode 8
13+
- [sourcekitten](https://github.com/jpsim/SourceKitten)
14+
15+
## Usage
16+
17+
Run `apidiff` from within a git repository like so:
18+
19+
apidiff <old git ref> <new git ref> objc <umbrella header>
20+
apidiff <old git ref> <new git ref> swift <workspace path> <scheme name>
21+
apidiff <old git ref> <new git ref> android <library>
22+
23+
# Example output
24+
25+
Auto-generated by running:
26+
27+
apidiff 734d43e406f53143c2cf8440f43d858d125f0a11 6f7a52744751e511d0daf119642446c46bed1f5c objc src/MaterialMotionRuntime.h
28+
29+
## NewClass
30+
31+
*new* class: `NewClass`
32+
33+
*new* constructor: `NewClass()`
34+
35+
*new* field: `text`
36+
37+
*new* method: `getText()`
38+
39+
## MDMPlanPerforming
40+
41+
*removed* method: `-addPlan:` in `MDMPlanPerforming`
42+
43+
*modified* protocol: `MDMPlanPerforming`
44+
45+
| Type | swift declaration |
46+
|---|---|
47+
| From | `protocol MDMPlanPerforming : MDMPerforming` |
48+
| To | `protocol PlanPerforming : Performing` |
49+
50+
## MDMScheduler
51+
52+
*modified* property: `delegate` in `MDMScheduler`
53+
54+
| Type | swift declaration |
55+
|---|---|
56+
| From | `weak var delegate: MDMSchedulerDelegate? { get set }` |
57+
| To | `weak var delegate: SchedulerDelegate? { get set }` |
58+
59+
*modified* class: `MDMScheduler`
60+
61+
| Type | swift declaration |
62+
|---|---|
63+
| From | `class MDMScheduler : NSObject` |
64+
| To | `class Scheduler : NSObject` |
465

566
## License
667

0 commit comments

Comments
 (0)