diff --git a/Makefile b/Makefile index 9de4475f..839b7723 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ install-templates: # Install Generamba templates .PHONY: generate-licenses generate-licenses: # Generate licenses with LicensePlist and regenerate project - mint run LicensePlist license-plist --output-path ${PRODUCT_NAME}/Settings.bundle + mint run LicensePlist license-plist --output-path ${PRODUCT_NAME}/Settings.bundle --add-version-numbers $(MAKE) generate-xcodeproj .PHONY: generate-module @@ -136,5 +136,5 @@ get-coverage: # Get code coverage .PHONY: show-devices show-devices: # Show devices - instruments -s devices + xcrun xctrace list devices diff --git a/Mintfile b/Mintfile index 992b4086..e93582b2 100644 --- a/Mintfile +++ b/Mintfile @@ -1,5 +1,5 @@ Carthage/Carthage@0.36.0 -yonaskolb/xcodegen@2.17.0 +yonaskolb/xcodegen@2.18.0 realm/SwiftLint@0.40.3 fromkk/SpellChecker@0.0.3 uber/mockolo@1.2.8 diff --git a/UhooiPicBook/Modules/MonsterDetail/Views/MonsterDetail.storyboard b/UhooiPicBook/Modules/MonsterDetail/Views/MonsterDetail.storyboard index c013b929..9326a6b9 100644 --- a/UhooiPicBook/Modules/MonsterDetail/Views/MonsterDetail.storyboard +++ b/UhooiPicBook/Modules/MonsterDetail/Views/MonsterDetail.storyboard @@ -1,9 +1,11 @@ - + - + + + @@ -15,49 +17,78 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - + + + - + + - - - - - - - - + + + + - @@ -68,10 +99,10 @@ - - - - + + + + @@ -80,6 +111,12 @@ - + + + + + + + diff --git a/UhooiPicBook/Base.lproj/LaunchScreen.storyboard b/UhooiPicBook/Resources/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from UhooiPicBook/Base.lproj/LaunchScreen.storyboard rename to UhooiPicBook/Resources/Base.lproj/LaunchScreen.storyboard diff --git a/UhooiPicBook/GoogleService-Info.plist b/UhooiPicBook/Resources/GoogleService-Info.plist similarity index 100% rename from UhooiPicBook/GoogleService-Info.plist rename to UhooiPicBook/Resources/GoogleService-Info.plist diff --git a/UhooiPicBook/Info.plist b/UhooiPicBook/Resources/Info.plist similarity index 100% rename from UhooiPicBook/Info.plist rename to UhooiPicBook/Resources/Info.plist diff --git a/UhooiPicBook/UhooiPicBook.entitlements b/UhooiPicBook/Resources/UhooiPicBook.entitlements similarity index 100% rename from UhooiPicBook/UhooiPicBook.entitlements rename to UhooiPicBook/Resources/UhooiPicBook.entitlements diff --git a/UhooiPicBook/Settings.bundle/Root.plist b/UhooiPicBook/Settings.bundle/Root.plist new file mode 100644 index 00000000..c5017883 --- /dev/null +++ b/UhooiPicBook/Settings.bundle/Root.plist @@ -0,0 +1,19 @@ + + + + + StringsTable + Root + PreferenceSpecifiers + + + Type + PSChildPaneSpecifier + Title + Licenses + File + com.mono0926.LicensePlist + + + + diff --git a/UhooiPicBook/Settings.bundle/en.lproj/Root.strings b/UhooiPicBook/Settings.bundle/en.lproj/Root.strings new file mode 100644 index 00000000..8cd87b9d Binary files /dev/null and b/UhooiPicBook/Settings.bundle/en.lproj/Root.strings differ diff --git a/UhooiPicBookTests/Modules/MonsterDetail/Interactors/MonsterDetailInteractorTests.swift b/UhooiPicBookTests/Modules/MonsterDetail/Interactors/MonsterDetailInteractorTests.swift index 8fabc3d1..f7be27f3 100644 --- a/UhooiPicBookTests/Modules/MonsterDetail/Interactors/MonsterDetailInteractorTests.swift +++ b/UhooiPicBookTests/Modules/MonsterDetail/Interactors/MonsterDetailInteractorTests.swift @@ -18,11 +18,11 @@ final class MonsterDetailInteractorTests: XCTestCase { // MARK: TestCase Life-Cycle Methods - override func setUp() { + override func setUpWithError() throws { reset() } - override func tearDown() { + override func tearDownWithError() throws { // Put teardown code here. This method is called after the invocation of each test method in the class. } diff --git a/UhooiPicBookTests/Modules/MonsterDetail/Presenters/MonsterDetailPresenterTests.swift b/UhooiPicBookTests/Modules/MonsterDetail/Presenters/MonsterDetailPresenterTests.swift index 6ad3845a..8b373745 100644 --- a/UhooiPicBookTests/Modules/MonsterDetail/Presenters/MonsterDetailPresenterTests.swift +++ b/UhooiPicBookTests/Modules/MonsterDetail/Presenters/MonsterDetailPresenterTests.swift @@ -20,11 +20,11 @@ final class MonsterDetailPresenterTests: XCTestCase { // MARK: TestCase Life-Cycle Methods - override func setUp() { + override func setUpWithError() throws { reset() } - override func tearDown() { + override func tearDownWithError() throws { // Put teardown code here. This method is called after the invocation of each test method in the class. } diff --git a/UhooiPicBookTests/Modules/MonsterList/Interactors/MonsterListInteractorTests.swift b/UhooiPicBookTests/Modules/MonsterList/Interactors/MonsterListInteractorTests.swift index 9e020bf1..901ae50e 100644 --- a/UhooiPicBookTests/Modules/MonsterList/Interactors/MonsterListInteractorTests.swift +++ b/UhooiPicBookTests/Modules/MonsterList/Interactors/MonsterListInteractorTests.swift @@ -21,11 +21,11 @@ final class MonsterListInteractorTests: XCTestCase { // MARK: TestCase Life-Cycle Methods - override func setUp() { + override func setUpWithError() throws { reset() } - override func tearDown() { + override func tearDownWithError() throws { // Put teardown code here. This method is called after the invocation of each test method in the class. } diff --git a/UhooiPicBookTests/Modules/MonsterList/Presenters/MonsterListPresenterTests.swift b/UhooiPicBookTests/Modules/MonsterList/Presenters/MonsterListPresenterTests.swift index 928601ed..ac63a246 100644 --- a/UhooiPicBookTests/Modules/MonsterList/Presenters/MonsterListPresenterTests.swift +++ b/UhooiPicBookTests/Modules/MonsterList/Presenters/MonsterListPresenterTests.swift @@ -20,11 +20,11 @@ final class MonsterListPresenterTests: XCTestCase { // MARK: TestCase Life-Cycle Methods - override func setUp() { + override func setUpWithError() throws { reset() } - override func tearDown() { + override func tearDownWithError() throws { // Put teardown code here. This method is called after the invocation of each test method in the class. } @@ -82,18 +82,18 @@ final class MonsterListPresenterTests: XCTestCase { } func test_viewDidLoad_newLine() { - typealias TestCase = (line: UInt, description: String, expect: String) + typealias TestCase = (description: String, expected: String, line: UInt) let testCases: [TestCase] = [ - (#line, "", "" ), - (#line, "¥¥n", "¥¥n" ), - (#line, "\n", "\n" ), - (#line, "\\n", "\n" ), - // (#line, "\\\n", "\\n" ), - (#line, "\\n\\n", "\n\n" ), - (#line, "test\\nuhooi", "test\nuhooi" ), + ("", "" , #line), + ("¥¥n", "¥¥n" , #line), + ("\n", "\n" , #line), + ("\\n", "\n" , #line), + // ("\\\n", "\\n" ,#line), + ("\\n\\n", "\n\n" , #line), + ("test\\nuhooi", "test\nuhooi" , #line), ] - for (line, description, expect) in testCases { + for (description, expected, line) in testCases { reset() let monsterDTO = MonsterDTO( name: "monster's name", @@ -107,7 +107,7 @@ final class MonsterListPresenterTests: XCTestCase { completion(.success([monsterDTO])) } self.viewMock.showMonstersHandler = { monsters in - XCTAssertEqual(monsters[0].description, expect, line: line) + XCTAssertEqual(monsters[0].description, expected, line: line) } self.presenter.viewDidLoad() diff --git a/UhooiPicBookTests/Repository/Temp/UserDefaultsClientTests.swift b/UhooiPicBookTests/Repository/Temp/UserDefaultsClientTests.swift index ce6ca434..09b28e66 100644 --- a/UhooiPicBookTests/Repository/Temp/UserDefaultsClientTests.swift +++ b/UhooiPicBookTests/Repository/Temp/UserDefaultsClientTests.swift @@ -16,11 +16,11 @@ final class UserDefaultsClientTests: XCTestCase { // MARK: TestCase Life-Cycle Methods - override func setUp() { + override func setUpWithError() throws { reset() } - override func tearDown() { + override func tearDownWithError() throws { } // MARK: - Test Methods diff --git a/UhooiPicBookUITests/TestCases/UhooiPicBookUITests.swift b/UhooiPicBookUITests/TestCases/UhooiPicBookUITests.swift index 0c2b062c..87880d57 100644 --- a/UhooiPicBookUITests/TestCases/UhooiPicBookUITests.swift +++ b/UhooiPicBookUITests/TestCases/UhooiPicBookUITests.swift @@ -12,7 +12,7 @@ final class UhooiPicBookUITests: XCTestCase { // MARK: TestCase Life-Cycle Methods - override func setUp() { + override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in the class. // In UI tests it is usually best to stop immediately when a failure occurs. @@ -21,7 +21,7 @@ final class UhooiPicBookUITests: XCTestCase { // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this. } - override func tearDown() { + override func tearDownWithError() throws { // Put teardown code here. This method is called after the invocation of each test method in the class. } diff --git a/project.yml b/project.yml index ed44fb84..60a3cb3d 100644 --- a/project.yml +++ b/project.yml @@ -27,11 +27,11 @@ targets: type: file settings: base: - MARKETING_VERSION: 1.2.0 - CURRENT_PROJECT_VERSION: 10 + MARKETING_VERSION: 1.2.1 + CURRENT_PROJECT_VERSION: 11 DEVELOPMENT_TEAM: 47E56DYP3N - INFOPLIST_FILE: UhooiPicBook/Info.plist - CODE_SIGN_ENTITLEMENTS: UhooiPicBook/UhooiPicBook.entitlements + INFOPLIST_FILE: UhooiPicBook/Resources/Info.plist + CODE_SIGN_ENTITLEMENTS: UhooiPicBook/Resources/UhooiPicBook.entitlements OTHER_LDFLAGS: $(inherited) $(OTHER_LDFLAGS) -ObjC DEVELOPMENT_LANGUAGE: jp dependencies: @@ -181,7 +181,7 @@ targets: CLANG_ENABLE_OBJC_WEAK: YES CODE_SIGN_IDENTITY: "iPhone Developer" CODE_SIGN_STYLE: Automatic - CURRENT_PROJECT_VERSION: 10 + CURRENT_PROJECT_VERSION: 11 DEBUG_INFORMATION_FORMAT: dwarf DEVELOPMENT_TEAM: 47E56DYP3N GCC_PREPROCESSOR_DEFINITIONS: @@ -190,7 +190,7 @@ targets: INFOPLIST_FILE: UhooiPicBookStickers/Info.plist IPHONEOS_DEPLOYMENT_TARGET: 11.0 LD_RUNPATH_SEARCH_PATHS: "" - MARKETING_VERSION: 1.2.0 + MARKETING_VERSION: 1.2.1 MTL_ENABLE_DEBUG_INFO: INCLUDE_SOURCE MTL_FAST_MATH: YES PRODUCT_BUNDLE_IDENTIFIER: com.theuhooi.UhooiPicBook.Stickers