Skip to content

Commit 6e0102e

Browse files
reneprenep
committed
Merge branch 'develop'
2 parents 460b6fa + e7f02a4 commit 6e0102e

File tree

54 files changed

+1964
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1964
-170
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# 0.11.5 (September 1, 2015)
2+
3+
Changes
4+
* Added support for CPD reports. (Thanks to rahulsom) Issue #191
5+
* Added that OCLint rules can be disabled
6+
* Added support for WatchKit (Thanks to icecrystal23) Issue #185
7+
* Fixed an issue where codesign and crashlytics would use the wrong version of developer tools (Thanks to icecrystal23) Issue #197
8+
* Added new simulator task for starting the simulator and running an app in the simulator (Thanks to jeduden) Issue #204
9+
110
## 0.11.4 (July 28, 2015)
211

312
Changes

‎Documentation/Parameters.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,18 @@ Note: see also https://deploygate.com/docs/api
345345
* _submitPath_ - Path to the crashlytics submit command (relative to the project dir)
346346

347347
default value: "Crashlytics.framework/submit"
348+
349+
## Coverage
350+
351+
[GCovr](http://gcovr.com) is used for coverage. Make your you have enabled the code coverage support in xcode (See https://developer.apple.com/library/ios/qa/qa1514/_index.html)
352+
353+
* _outputFormat_ - The coverage output format: can be text, xml or html
354+
355+
default value: empty - Creates text summary
356+
357+
* _exclude_ - Files to exclude for the coverage report as regular expresssion: e.g. '.*h$|.*UnitTests.*m$'
358+
359+
348360

349361
## OCLint Parameters
350362

@@ -363,6 +375,19 @@ oclint {
363375
}
364376
```
365377

378+
* _disableRules_ - the rules that should be disabled as array (see also: http://docs.oclint.org/en/dev/rules/index.html) e.g
379+
380+
```
381+
oclint {
382+
disableRules = [
383+
"UnusedMethodParameter",
384+
"UselessParentheses",
385+
"IvarAssignmentOutsideAccessorsOrInit"
386+
]
387+
}
388+
```
389+
390+
366391
* _excludes_ - array of elements that should be excluded. e.g.
367392

368393
```
@@ -375,4 +400,5 @@ oclint {
375400

376401
default values: maxPriority1=0, maxPriority2=10, maxPriority3=20
377402

403+
378404

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Here a brief overview of the features:
2929
* Java 1.6 or greater
3030

3131

32-
### Current stable version is 0.11.4
32+
### Current stable version is 0.11.5
3333

3434
0.9.x up to 0.11.x supports Xcode 5, Xcode 6.* and Xcode 7
3535

@@ -50,7 +50,7 @@ Here the minimal content you need in your build.gradle file:
5050

5151
```
5252
plugins {
53-
id "org.openbakery.xcode-plugin" version "0.11.4"
53+
id "org.openbakery.xcode-plugin" version "0.11.5"
5454
}
5555
5656
xcodebuild {

‎example/OSX/ExampleOSX/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ DEPENDENCIES:
77
SPEC CHECKSUMS:
88
Sparkle: 75bbbc5ab2d666f7f77c241afe7fd28364a8f9f7
99

10-
COCOAPODS: 0.36.4
10+
COCOAPODS: 0.38.2

‎example/iOS/Example/Example WatchKit App/Base.lproj/Interface.storyboard

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="6724" systemVersion="14A389" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="AgC-eL-Hgc">
3+
<dependencies>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6711"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="3735"/>
6+
</dependencies>
7+
<scenes>
8+
<!--Interface Controller-->
9+
<scene sceneID="aou-V4-d1y">
10+
<objects>
11+
<controller id="AgC-eL-Hgc" customClass="InterfaceController" customModuleProvider=""/>
12+
</objects>
13+
<point key="canvasLocation" x="220" y="345"/>
14+
</scene>
15+
<!--Static Notification Interface Controller-->
16+
<scene sceneID="AEw-b0-oYE">
17+
<objects>
18+
<notificationController id="YCC-NB-fut">
19+
<items>
20+
<label alignment="left" text="Alert Label" id="IdU-wH-bcW"/>
21+
</items>
22+
<notificationCategory key="notificationCategory" identifier="myCategory" id="JfB-70-Muf"/>
23+
<connections>
24+
<outlet property="notificationAlertLabel" destination="IdU-wH-bcW" id="JKC-fr-R95"/>
25+
<segue destination="4sK-HA-Art" kind="relationship" relationship="dynamicNotificationInterface" id="kXh-Jw-8B1"/>
26+
</connections>
27+
</notificationController>
28+
</objects>
29+
<point key="canvasLocation" x="220" y="643"/>
30+
</scene>
31+
<!--Notification Controller-->
32+
<scene sceneID="ZPc-GJ-vnh">
33+
<objects>
34+
<controller id="4sK-HA-Art" customClass="NotificationController" customModuleProvider=""/>
35+
</objects>
36+
<point key="canvasLocation" x="468" y="643"/>
37+
</scene>
38+
</scenes>
39+
</document>

‎example/iOS/Example/Example WatchKit App/Images.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"images" : [
3+
{
4+
"size" : "24x24",
5+
"idiom" : "watch",
6+
"scale" : "2x",
7+
"role" : "notificationCenter",
8+
"subtype" : "38mm"
9+
},
10+
{
11+
"size" : "27.5x27.5",
12+
"idiom" : "watch",
13+
"scale" : "2x",
14+
"role" : "notificationCenter",
15+
"subtype" : "42mm"
16+
},
17+
{
18+
"size" : "29x29",
19+
"idiom" : "watch",
20+
"role" : "companionSettings",
21+
"scale" : "2x"
22+
},
23+
{
24+
"size" : "29x29",
25+
"idiom" : "watch",
26+
"role" : "companionSettings",
27+
"scale" : "3x"
28+
},
29+
{
30+
"size" : "40x40",
31+
"idiom" : "watch",
32+
"scale" : "2x",
33+
"role" : "appLauncher",
34+
"subtype" : "38mm"
35+
},
36+
{
37+
"size" : "44x44",
38+
"idiom" : "watch",
39+
"scale" : "2x",
40+
"role" : "longLook",
41+
"subtype" : "42mm"
42+
},
43+
{
44+
"size" : "86x86",
45+
"idiom" : "watch",
46+
"scale" : "2x",
47+
"role" : "quickLook",
48+
"subtype" : "38mm"
49+
},
50+
{
51+
"size" : "98x98",
52+
"idiom" : "watch",
53+
"scale" : "2x",
54+
"role" : "quickLook",
55+
"subtype" : "42mm"
56+
}
57+
],
58+
"info" : {
59+
"version" : 1,
60+
"author" : "xcode"
61+
}
62+
}

‎example/iOS/Example/Example WatchKit App/Info.plist

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>Example</string>
9+
<key>CFBundleExecutable</key>
10+
<string>$(EXECUTABLE_NAME)</string>
11+
<key>CFBundleIdentifier</key>
12+
<string>org.openbakery.Example.watchkitapp</string>
13+
<key>CFBundleInfoDictionaryVersion</key>
14+
<string>6.0</string>
15+
<key>CFBundleName</key>
16+
<string>$(PRODUCT_NAME)</string>
17+
<key>CFBundlePackageType</key>
18+
<string>APPL</string>
19+
<key>CFBundleShortVersionString</key>
20+
<string>1.0</string>
21+
<key>CFBundleSignature</key>
22+
<string>????</string>
23+
<key>CFBundleVersion</key>
24+
<string>1.0</string>
25+
<key>UISupportedInterfaceOrientations</key>
26+
<array>
27+
<string>UIInterfaceOrientationPortrait</string>
28+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
29+
</array>
30+
<key>WKCompanionAppBundleIdentifier</key>
31+
<string>org.openbakery.Example</string>
32+
<key>WKWatchKitApp</key>
33+
<true/>
34+
</dict>
35+
</plist>

‎example/iOS/Example/Example WatchKit Extension/Images.xcassets/README__ignoredByTemplate__

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Did you know that git does not support storing empty directories?

‎example/iOS/Example/Example WatchKit Extension/Info.plist

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>Example WatchKit Extension</string>
9+
<key>CFBundleExecutable</key>
10+
<string>$(EXECUTABLE_NAME)</string>
11+
<key>CFBundleIdentifier</key>
12+
<string>org.openbakery.Example.watchkitextension</string>
13+
<key>CFBundleInfoDictionaryVersion</key>
14+
<string>6.0</string>
15+
<key>CFBundleName</key>
16+
<string>$(PRODUCT_NAME)</string>
17+
<key>CFBundlePackageType</key>
18+
<string>XPC!</string>
19+
<key>CFBundleShortVersionString</key>
20+
<string>1.0</string>
21+
<key>CFBundleSignature</key>
22+
<string>????</string>
23+
<key>CFBundleVersion</key>
24+
<string>1.0</string>
25+
<key>NSExtension</key>
26+
<dict>
27+
<key>NSExtensionAttributes</key>
28+
<dict>
29+
<key>WKAppBundleIdentifier</key>
30+
<string>org.openbakery.Example.watchkitapp</string>
31+
</dict>
32+
<key>NSExtensionPointIdentifier</key>
33+
<string>com.apple.watchkit</string>
34+
</dict>
35+
<key>RemoteInterfacePrincipalClass</key>
36+
<string>InterfaceController</string>
37+
</dict>
38+
</plist>

‎example/iOS/Example/Example WatchKit Extension/InterfaceController.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//
2+
// InterfaceController.h
3+
// Example WatchKit Extension
4+
//
5+
// Created by Tracy Keeling on 6/9/15.
6+
// Copyright (c) 2015 Rene Pirringer. All rights reserved.
7+
//
8+
9+
#import <WatchKit/WatchKit.h>
10+
#import <Foundation/Foundation.h>
11+
12+
@interface InterfaceController : WKInterfaceController
13+
14+
@end

0 commit comments

Comments
 (0)