Skip to content

Commit 722e386

Browse files
author
Alexander Perechnev
committed
Merge branch 'release/4.0'
2 parents d6f98b0 + 57ec2af commit 722e386

16 files changed

Lines changed: 197 additions & 136 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: objective-c
2-
osx_image: xcode7.3
2+
osx_image: xcode8.2
33
script:
4-
- xcodebuild -workspace SidebarOverlay.xcworkspace -scheme SidebarOverlay -sdk iphonesimulator build test GCC_GENERATE_TEST_COVERAGE_FILES=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES
4+
- xcodebuild -workspace SidebarOverlay.xcworkspace -scheme SidebarOverlay -sdk iphonesimulator10.2 -destination 'platform=iOS Simulator,OS=10.1,name=iPhone SE' build test GCC_GENERATE_TEST_COVERAGE_FILES=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES
55
after_success:
66
- bash <(curl -s https://codecov.io/bash)
77
notifications:

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 4.0.0
2+
3+
* Migrated to Swift 3
4+
* Removed `SideViewControllerTrailingIndent` property. Use `sideMenuWidth` property instead.
5+
16
# 3.0.0
27

38
* Now it's possible to choose side where sibedar view controller appears from. Please the the PR #14 (https://github.com/alexkrzyzanowski/SidebarOverlay/pull/14). Thanks to [Eugene Mozharovsky](https://github.com/Mozharovsky).

SidebarOverlay.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Pod::Spec.new do |s|
22
s.name = "SidebarOverlay"
3-
s.version = "3.1.0"
3+
s.version = "4.0"
44
s.summary = "Yet another implementation of sidebar menu, but here your menu appears over the top view controller."
55

66
s.description = "Yet another implementation of sidebar menu, but here your menu appears over the top view controller. You questions and pull requests are wolcome."
77

8-
s.homepage = "https://github.com/alexkrzyzanowski/SidebarOverlay"
8+
s.homepage = "https://github.com/aperechnev/SidebarOverlay"
99
s.license = { :type => 'MIT', :file => 'LICENSE' }
10-
s.author = { "Alex Krzyzanowski" => "alexkrzyzanowski@icloud.com" }
11-
s.source = { :git => "https://github.com/alexkrzyzanowski/SidebarOverlay.git", :tag => "3.1.0" }
10+
s.author = { "Alexander Perechnev" => "alexander@perechnev.com" }
11+
s.source = { :git => "https://github.com/aperechnev/SidebarOverlay.git", :tag => "4.0" }
1212

1313
s.platform = :ios, '8.0'
1414
s.source_files = 'SidebarOverlay/SidebarOverlay/*.{h,m,swift}'

SidebarOverlay/SidebarOverlay.xcodeproj/project.pbxproj

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,16 @@
153153
attributes = {
154154
CLASSPREFIX = SO;
155155
LastSwiftUpdateCheck = 0720;
156-
LastUpgradeCheck = 0720;
156+
LastUpgradeCheck = 0810;
157157
ORGANIZATIONNAME = "Alex Krzyżanowski";
158158
TargetAttributes = {
159159
322EAC0E1C2B3F820077D684 = {
160160
CreatedOnToolsVersion = 7.2;
161+
LastSwiftMigration = 0810;
161162
};
162163
322EAC181C2B3F820077D684 = {
163164
CreatedOnToolsVersion = 7.2;
165+
LastSwiftMigration = 0810;
164166
};
165167
};
166168
};
@@ -242,8 +244,10 @@
242244
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
243245
CLANG_WARN_EMPTY_BODY = YES;
244246
CLANG_WARN_ENUM_CONVERSION = YES;
247+
CLANG_WARN_INFINITE_RECURSION = YES;
245248
CLANG_WARN_INT_CONVERSION = YES;
246249
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
250+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
247251
CLANG_WARN_UNREACHABLE_CODE = YES;
248252
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
249253
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -266,7 +270,7 @@
266270
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
267271
GCC_WARN_UNUSED_FUNCTION = YES;
268272
GCC_WARN_UNUSED_VARIABLE = YES;
269-
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
273+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
270274
MTL_ENABLE_DEBUG_INFO = YES;
271275
ONLY_ACTIVE_ARCH = YES;
272276
SDKROOT = iphoneos;
@@ -290,8 +294,10 @@
290294
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
291295
CLANG_WARN_EMPTY_BODY = YES;
292296
CLANG_WARN_ENUM_CONVERSION = YES;
297+
CLANG_WARN_INFINITE_RECURSION = YES;
293298
CLANG_WARN_INT_CONVERSION = YES;
294299
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
300+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
295301
CLANG_WARN_UNREACHABLE_CODE = YES;
296302
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
297303
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -308,9 +314,10 @@
308314
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
309315
GCC_WARN_UNUSED_FUNCTION = YES;
310316
GCC_WARN_UNUSED_VARIABLE = YES;
311-
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
317+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
312318
MTL_ENABLE_DEBUG_INFO = NO;
313319
SDKROOT = iphoneos;
320+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
314321
TARGETED_DEVICE_FAMILY = "1,2";
315322
VALIDATE_PRODUCT = YES;
316323
VERSIONING_SYSTEM = "apple-generic";
@@ -322,6 +329,7 @@
322329
isa = XCBuildConfiguration;
323330
buildSettings = {
324331
CLANG_ENABLE_MODULES = YES;
332+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
325333
DEFINES_MODULE = YES;
326334
DYLIB_COMPATIBILITY_VERSION = 1;
327335
DYLIB_CURRENT_VERSION = 1;
@@ -334,13 +342,15 @@
334342
PRODUCT_NAME = "$(TARGET_NAME)";
335343
SKIP_INSTALL = YES;
336344
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
345+
SWIFT_VERSION = 3.0;
337346
};
338347
name = Debug;
339348
};
340349
322EAC251C2B3F830077D684 /* Release */ = {
341350
isa = XCBuildConfiguration;
342351
buildSettings = {
343352
CLANG_ENABLE_MODULES = YES;
353+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
344354
DEFINES_MODULE = YES;
345355
DYLIB_COMPATIBILITY_VERSION = 1;
346356
DYLIB_CURRENT_VERSION = 1;
@@ -352,6 +362,7 @@
352362
PRODUCT_BUNDLE_IDENTIFIER = ru.perechnev.SidebarOverlay;
353363
PRODUCT_NAME = "$(TARGET_NAME)";
354364
SKIP_INSTALL = YES;
365+
SWIFT_VERSION = 3.0;
355366
};
356367
name = Release;
357368
};
@@ -362,6 +373,7 @@
362373
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
363374
PRODUCT_BUNDLE_IDENTIFIER = ru.perechnev.SidebarOverlayTests;
364375
PRODUCT_NAME = "$(TARGET_NAME)";
376+
SWIFT_VERSION = 3.0;
365377
};
366378
name = Debug;
367379
};
@@ -372,6 +384,7 @@
372384
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
373385
PRODUCT_BUNDLE_IDENTIFIER = ru.perechnev.SidebarOverlayTests;
374386
PRODUCT_NAME = "$(TARGET_NAME)";
387+
SWIFT_VERSION = 3.0;
375388
};
376389
name = Release;
377390
};

SidebarOverlay/SidebarOverlay.xcodeproj/xcshareddata/xcschemes/SidebarOverlay.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 = "0720"
3+
LastUpgradeVersion = "0810"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

SidebarOverlay/SidebarOverlay/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>3.1.0</string>
18+
<string>4.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)