Skip to content

Commit d40a968

Browse files
jbouazizDiego Ernst
authored andcommitted
Eureka 4.0 et Swift 4.0 (#12)
* Converted to swift 4 and bumped Eureka dependency * Bumped podspec * Updated README
1 parent 0384bbc commit d40a968

File tree

7 files changed

+28
-20
lines changed

7 files changed

+28
-20
lines changed

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "xmartlabs/Eureka" ~> 3.0
1+
github "xmartlabs/Eureka" ~> 4.0

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "xmartlabs/Eureka" "3.1.0"
1+
github "xmartlabs/Eureka" "4.0.0"

Example/Example.xcodeproj/project.pbxproj

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,12 @@
230230
};
231231
CFEB41671D7E0AB50091C10E = {
232232
CreatedOnToolsVersion = 7.3.1;
233-
LastSwiftMigration = 0810;
233+
LastSwiftMigration = 0900;
234234
TestTargetID = CFEB41531D7E0AB50091C10E;
235235
};
236236
CFEB41721D7E0AB50091C10E = {
237237
CreatedOnToolsVersion = 7.3.1;
238-
LastSwiftMigration = 0810;
238+
LastSwiftMigration = 0900;
239239
TestTargetID = CFEB41531D7E0AB50091C10E;
240240
};
241241
};
@@ -450,7 +450,8 @@
450450
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
451451
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.Example;
452452
PRODUCT_NAME = "$(TARGET_NAME)";
453-
SWIFT_VERSION = 3.0;
453+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
454+
SWIFT_VERSION = 4.0;
454455
};
455456
name = Debug;
456457
};
@@ -466,7 +467,8 @@
466467
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
467468
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.Example;
468469
PRODUCT_NAME = "$(TARGET_NAME)";
469-
SWIFT_VERSION = 3.0;
470+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
471+
SWIFT_VERSION = 4.0;
470472
};
471473
name = Release;
472474
};
@@ -478,7 +480,8 @@
478480
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
479481
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.ExampleTests;
480482
PRODUCT_NAME = "$(TARGET_NAME)";
481-
SWIFT_VERSION = 3.0;
483+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
484+
SWIFT_VERSION = 4.0;
482485
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
483486
};
484487
name = Debug;
@@ -491,7 +494,8 @@
491494
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
492495
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.ExampleTests;
493496
PRODUCT_NAME = "$(TARGET_NAME)";
494-
SWIFT_VERSION = 3.0;
497+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
498+
SWIFT_VERSION = 4.0;
495499
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
496500
};
497501
name = Release;
@@ -503,7 +507,8 @@
503507
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
504508
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.ExampleUITests;
505509
PRODUCT_NAME = "$(TARGET_NAME)";
506-
SWIFT_VERSION = 3.0;
510+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
511+
SWIFT_VERSION = 4.0;
507512
TEST_TARGET_NAME = Example;
508513
};
509514
name = Debug;
@@ -515,7 +520,8 @@
515520
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
516521
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.ExampleUITests;
517522
PRODUCT_NAME = "$(TARGET_NAME)";
518-
SWIFT_VERSION = 3.0;
523+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
524+
SWIFT_VERSION = 4.0;
519525
TEST_TARGET_NAME = Example;
520526
};
521527
name = Release;

GenericPasswordRow.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = "GenericPasswordRow"
3-
spec.version = "2.1.2"
3+
spec.version = "3.0.0"
44
spec.summary = "Eureka row to validate passwords"
55
spec.homepage = "https://github.com/EurekaCommunity/GenericPasswordRow"
66
spec.license = { type: 'MIT', file: 'LICENSE' }
@@ -14,5 +14,5 @@ Pod::Spec.new do |spec|
1414
'GenericPasswordRow' => ['Resources/*']
1515
}
1616
spec.ios.frameworks = 'UIKit', 'Foundation'
17-
spec.dependency "Eureka", "~> 3.0"
17+
spec.dependency "Eureka", "~> 4.0"
1818
end

GenericPasswordRow.xcodeproj/project.pbxproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
TargetAttributes = {
207207
CFFC76AC1D7DFF29006C3E55 = {
208208
CreatedOnToolsVersion = 7.3.1;
209-
LastSwiftMigration = 0810;
209+
LastSwiftMigration = 0900;
210210
};
211211
CFFC76B61D7DFF2A006C3E55 = {
212212
CreatedOnToolsVersion = 7.3.1;
@@ -410,7 +410,8 @@
410410
PRODUCT_NAME = "$(TARGET_NAME)";
411411
SKIP_INSTALL = YES;
412412
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
413-
SWIFT_VERSION = 3.0;
413+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
414+
SWIFT_VERSION = 4.0;
414415
};
415416
name = Debug;
416417
};
@@ -435,7 +436,8 @@
435436
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.GenericPasswordRow;
436437
PRODUCT_NAME = "$(TARGET_NAME)";
437438
SKIP_INSTALL = YES;
438-
SWIFT_VERSION = 3.0;
439+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
440+
SWIFT_VERSION = 4.0;
439441
};
440442
name = Release;
441443
};
@@ -447,7 +449,7 @@
447449
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
448450
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.GenericPasswordRowTests;
449451
PRODUCT_NAME = "$(TARGET_NAME)";
450-
SWIFT_VERSION = 3.0;
452+
SWIFT_VERSION = 4.0;
451453
};
452454
name = Debug;
453455
};
@@ -459,7 +461,7 @@
459461
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
460462
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.GenericPasswordRowTests;
461463
PRODUCT_NAME = "$(TARGET_NAME)";
462-
SWIFT_VERSION = 3.0;
464+
SWIFT_VERSION = 4.0;
463465
};
464466
name = Release;
465467
};

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Follow these steps to run Example project:
8383
To install GenericPasswordRow, simply add the following line to your Podfile:
8484

8585
```ruby
86-
pod 'GenericPasswordRow', '~> 2.1'
86+
pod 'GenericPasswordRow', '~> 3.0'
8787
```
8888

8989
#### Carthage
@@ -93,7 +93,7 @@ pod 'GenericPasswordRow', '~> 2.1'
9393
To install GenericPasswordRow, simply add the following line to your Cartfile:
9494

9595
```ogdl
96-
github "EurekaCommunity/GenericPasswordRow" ~> 2.1
96+
github "EurekaCommunity/GenericPasswordRow" ~> 3.0
9797
```
9898

9999

Sources/GenericPasswordCell.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ open class GenericPasswordCell: _FieldCell<String>, CellType {
7070
textField.placeholder = genericPasswordRow.placeholder
7171
}
7272

73-
open func togglePasswordVisibility() {
73+
@objc open func togglePasswordVisibility() {
7474
textField.isSecureTextEntry = !textField.isSecureTextEntry
7575
setVisibilityButtonImage()
7676
// workaround to update cursor position

0 commit comments

Comments
 (0)