Skip to content

Commit 805aa2c

Browse files
author
Rene Pirringer
committed
Merge branch 'develop'
2 parents 4bd7593 + d6b78b7 commit 805aa2c

File tree

80 files changed

+4650
-572
lines changed

Some content is hidden

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

80 files changed

+4650
-572
lines changed

‎.editorconfig

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
indent_style = tab
6+
indent_size = tab
7+
tab_width = 2
8+
end_of_line = lf
9+
charset = utf-8
10+
trim_trailing_whitespace = true
11+
insert_final_newline = true
12+
curly_bracket_next_line = false
13+
spaces_around_operators = true
14+
15+
[*.json]
16+
insert_final_newline = ignore
17+
18+
[*.md]
19+
trim_trailing_whitespace = false
20+

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 0.15.4 (Feb 1, 2019)
2+
3+
Bugfixes
4+
* IPAs build with Xcode 10.1 result in 'Invalid Swift Support' #401
5+
16
# 0.15.3 (May 7, 2018)
27

38
Bugfixes

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ apply plugin: "org.openbakery.xcode-plugin"
8585

8686
When using the [openbakery.org](https://openbakery.org) repository you can also get the latest develop version by including `develop` into the version pattern. e.g.:
8787
```
88-
classpath "org.openbakery:xcode-plugin:0.15.3.develop.+"
88+
classpath "org.openbakery:xcode-plugin:0.15.4.develop.+"
8989
```
9090

9191
The develop version contains all the changes from the develop branch, where all the fixes and feature are implemented. The development version is deployed automatically when all the projects unit tests are successful, and also the if the example projects build.

‎build.gradle

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ allprojects {
22
apply plugin: 'java-gradle-plugin'
33
apply plugin: 'groovy'
44

5-
def versionNumber = "0.15.2"
5+
def versionNumber = "0.15.4"
66

77
if (project.hasProperty("versionNumber")) {
88
versionNumber = project.versionNumber
@@ -35,7 +35,7 @@ allprojects {
3535

3636
testCompile 'junit:junit:4.12'
3737
testCompile 'org.hamcrest:hamcrest-all:1.3'
38-
testCompile 'org.codehaus.groovy:groovy-all:2.4.12'
38+
testCompile 'org.codehaus.groovy:groovy-all:2.4.15'
3939
testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
4040
testCompile 'org.objenesis:objenesis:1.2'
4141
testCompile 'cglib:cglib-nodep:2.2.2'
@@ -62,6 +62,7 @@ allprojects {
6262
project(':plugin') {
6363
dependencies {
6464
compileOnly project(':libxcode')
65+
compileOnly project(':libxcodetools')
6566
testCompile project(':libtest')
6667
}
6768
}
@@ -73,8 +74,17 @@ project(':libxcode') {
7374
}
7475
}
7576

77+
project(':libxcodetools') {
78+
dependencies {
79+
compile project(':libxcode')
80+
testCompile project(':libtest')
81+
}
82+
}
83+
84+
7685
project(':libtest') {
7786
dependencies {
7887
compile project(':libxcode')
88+
compile project(':libxcodetools')
7989
}
8090
}

‎example/iOS/Example/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
build
22
Example.xcodeproj/xcuserdata/
3-
Example.xcodeproj/project.xcworkspace/

‎example/iOS/Example/Example.xcodeproj/project.pbxproj

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@
488488
KnownAssetTags = (
489489
SampleImages,
490490
);
491-
LastUpgradeCheck = 0820;
491+
LastUpgradeCheck = 1000;
492492
ORGANIZATIONNAME = "Rene Pirringer";
493493
TargetAttributes = {
494494
5AC571C01EF81D03002ED5E8 = {
@@ -891,14 +891,22 @@
891891
CLANG_CXX_LIBRARY = "libc++";
892892
CLANG_ENABLE_MODULES = YES;
893893
CLANG_ENABLE_OBJC_ARC = YES;
894+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
894895
CLANG_WARN_BOOL_CONVERSION = YES;
896+
CLANG_WARN_COMMA = YES;
895897
CLANG_WARN_CONSTANT_CONVERSION = YES;
898+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
896899
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
897900
CLANG_WARN_EMPTY_BODY = YES;
898901
CLANG_WARN_ENUM_CONVERSION = YES;
899902
CLANG_WARN_INFINITE_RECURSION = YES;
900903
CLANG_WARN_INT_CONVERSION = YES;
904+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
905+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
906+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
901907
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
908+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
909+
CLANG_WARN_STRICT_PROTOTYPES = YES;
902910
CLANG_WARN_SUSPICIOUS_MOVE = YES;
903911
CLANG_WARN_UNREACHABLE_CODE = YES;
904912
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -936,14 +944,22 @@
936944
CLANG_CXX_LIBRARY = "libc++";
937945
CLANG_ENABLE_MODULES = YES;
938946
CLANG_ENABLE_OBJC_ARC = YES;
947+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
939948
CLANG_WARN_BOOL_CONVERSION = YES;
949+
CLANG_WARN_COMMA = YES;
940950
CLANG_WARN_CONSTANT_CONVERSION = YES;
951+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
941952
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
942953
CLANG_WARN_EMPTY_BODY = YES;
943954
CLANG_WARN_ENUM_CONVERSION = YES;
944955
CLANG_WARN_INFINITE_RECURSION = YES;
945956
CLANG_WARN_INT_CONVERSION = YES;
957+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
958+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
959+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
946960
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
961+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
962+
CLANG_WARN_STRICT_PROTOTYPES = YES;
947963
CLANG_WARN_SUSPICIOUS_MOVE = YES;
948964
CLANG_WARN_UNREACHABLE_CODE = YES;
949965
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1058,14 +1074,22 @@
10581074
CLANG_CXX_LIBRARY = "libc++";
10591075
CLANG_ENABLE_MODULES = YES;
10601076
CLANG_ENABLE_OBJC_ARC = YES;
1077+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
10611078
CLANG_WARN_BOOL_CONVERSION = YES;
1079+
CLANG_WARN_COMMA = YES;
10621080
CLANG_WARN_CONSTANT_CONVERSION = YES;
1081+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
10631082
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
10641083
CLANG_WARN_EMPTY_BODY = YES;
10651084
CLANG_WARN_ENUM_CONVERSION = YES;
10661085
CLANG_WARN_INFINITE_RECURSION = YES;
10671086
CLANG_WARN_INT_CONVERSION = YES;
1087+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1088+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1089+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
10681090
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1091+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1092+
CLANG_WARN_STRICT_PROTOTYPES = YES;
10691093
CLANG_WARN_SUSPICIOUS_MOVE = YES;
10701094
CLANG_WARN_UNREACHABLE_CODE = YES;
10711095
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1240,6 +1264,7 @@
12401264
5AC571CB1EF81D03002ED5E8 /* Test */,
12411265
);
12421266
defaultConfigurationIsVisible = 0;
1267+
defaultConfigurationName = Release;
12431268
};
12441269
A55E38C41B276F4C00EAF0B8 /* Build configuration list for PBXNativeTarget "Example WatchKit App" */ = {
12451270
isa = XCConfigurationList;

‎example/iOS/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
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>BuildSystemType</key>
6+
<string>Original</string>
7+
</dict>
8+
</plist>

‎example/iOS/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎example/iOS/SwiftExample/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ use_frameworks!
55
source 'https://github.com/CocoaPods/Specs.git'
66

77
target 'SwiftExample' do
8-
pod 'Alamofire', '~> 4.0'
8+
pod 'Alamofire', '~> 4.7'
99
end

‎example/iOS/SwiftExample/SwiftExample.xcodeproj/project.pbxproj

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,16 +184,16 @@
184184
isa = PBXProject;
185185
attributes = {
186186
LastSwiftUpdateCheck = 0710;
187-
LastUpgradeCheck = 0900;
187+
LastUpgradeCheck = 1000;
188188
ORGANIZATIONNAME = "Rene Pirringer";
189189
TargetAttributes = {
190190
A7B734A01A80E76900EE8EBD = {
191191
CreatedOnToolsVersion = 6.1.1;
192-
LastSwiftMigration = 0800;
192+
LastSwiftMigration = 1000;
193193
};
194194
A7B734B51A80E76900EE8EBD = {
195195
CreatedOnToolsVersion = 6.1.1;
196-
LastSwiftMigration = 0800;
196+
LastSwiftMigration = 1000;
197197
TestTargetID = A7B734A01A80E76900EE8EBD;
198198
};
199199
};
@@ -244,13 +244,16 @@
244244
files = (
245245
);
246246
inputPaths = (
247+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
248+
"${PODS_ROOT}/Manifest.lock",
247249
);
248250
name = "[CP] Check Pods Manifest.lock";
249251
outputPaths = (
252+
"$(DERIVED_FILE_DIR)/Pods-SwiftExample-checkManifestLockResult.txt",
250253
);
251254
runOnlyForDeploymentPostprocessing = 0;
252255
shellPath = /bin/sh;
253-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
256+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
254257
showEnvVarsInLog = 0;
255258
};
256259
7390633B09AB2F48975C66C5 /* [CP] Copy Pods Resources */ = {
@@ -274,9 +277,12 @@
274277
files = (
275278
);
276279
inputPaths = (
280+
"${SRCROOT}/Pods/Target Support Files/Pods-SwiftExample/Pods-SwiftExample-frameworks.sh",
281+
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
277282
);
278283
name = "[CP] Embed Pods Frameworks";
279284
outputPaths = (
285+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
280286
);
281287
runOnlyForDeploymentPostprocessing = 0;
282288
shellPath = /bin/sh;
@@ -345,12 +351,14 @@
345351
CLANG_WARN_BOOL_CONVERSION = YES;
346352
CLANG_WARN_COMMA = YES;
347353
CLANG_WARN_CONSTANT_CONVERSION = YES;
354+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
348355
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
349356
CLANG_WARN_EMPTY_BODY = YES;
350357
CLANG_WARN_ENUM_CONVERSION = YES;
351358
CLANG_WARN_INFINITE_RECURSION = YES;
352359
CLANG_WARN_INT_CONVERSION = YES;
353360
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
361+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
354362
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
355363
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
356364
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -397,12 +405,14 @@
397405
CLANG_WARN_BOOL_CONVERSION = YES;
398406
CLANG_WARN_COMMA = YES;
399407
CLANG_WARN_CONSTANT_CONVERSION = YES;
408+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
400409
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
401410
CLANG_WARN_EMPTY_BODY = YES;
402411
CLANG_WARN_ENUM_CONVERSION = YES;
403412
CLANG_WARN_INFINITE_RECURSION = YES;
404413
CLANG_WARN_INT_CONVERSION = YES;
405414
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
415+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
406416
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
407417
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
408418
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -440,7 +450,8 @@
440450
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
441451
PRODUCT_BUNDLE_IDENTIFIER = "org.openbakery.$(PRODUCT_NAME:rfc1034identifier)";
442452
PRODUCT_NAME = "$(TARGET_NAME)";
443-
SWIFT_VERSION = 3.0;
453+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
454+
SWIFT_VERSION = 4.2;
444455
};
445456
name = Debug;
446457
};
@@ -454,7 +465,8 @@
454465
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
455466
PRODUCT_BUNDLE_IDENTIFIER = "org.openbakery.$(PRODUCT_NAME:rfc1034identifier)";
456467
PRODUCT_NAME = "$(TARGET_NAME)";
457-
SWIFT_VERSION = 3.0;
468+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
469+
SWIFT_VERSION = 4.2;
458470
};
459471
name = Release;
460472
};
@@ -474,7 +486,8 @@
474486
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
475487
PRODUCT_BUNDLE_IDENTIFIER = "org.openbakery.$(PRODUCT_NAME:rfc1034identifier)";
476488
PRODUCT_NAME = "$(TARGET_NAME)";
477-
SWIFT_VERSION = 3.0;
489+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
490+
SWIFT_VERSION = 4.2;
478491
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftExample.app/SwiftExample";
479492
};
480493
name = Debug;
@@ -491,7 +504,8 @@
491504
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
492505
PRODUCT_BUNDLE_IDENTIFIER = "org.openbakery.$(PRODUCT_NAME:rfc1034identifier)";
493506
PRODUCT_NAME = "$(TARGET_NAME)";
494-
SWIFT_VERSION = 3.0;
507+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
508+
SWIFT_VERSION = 4.2;
495509
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftExample.app/SwiftExample";
496510
};
497511
name = Release;

0 commit comments

Comments
 (0)