Skip to content

Commit

Permalink
Merge branch 'master' of github.com:pietrocaselani/CouchTracker into …
Browse files Browse the repository at this point in the history 
…tuist
  • Loading branch information
@pietrocaselani
pietrocaselani committed May 18, 2019
2 parents 7d38c9e + 752f774 commit fa5e2f1
Show file tree
Hide file tree
Showing 24 changed files with 34 additions and 22 deletions.
2 changes: 1 addition & 1 deletion CouchTracker/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
Expand Down
2 changes: 1 addition & 1 deletion CouchTrackerApp/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion CouchTrackerAppTestable/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>37</string>
<string>42</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion CouchTrackerCore-iOS/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion CouchTrackerCore/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2018 Pietro Caselani. All rights reserved.</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion CouchTrackerCoreTests/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion CouchTrackerDebug/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion CouchTrackerPersistence/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
</dict>
</plist>
3 changes: 3 additions & 0 deletions CouchTrackerUITests/AppStartupEnglishUSTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import KIF

final class AppStartupEnglishUSTests: KIFTestCase {
func testChangeTabs_enUS() {
tester().waitForView(withAccessibilityLabel: "Ok")
tester().tapView(withAccessibilityLabel: "Ok")

tester().tapView(withAccessibilityLabel: "Shows")
tester().tapView(withAccessibilityLabel: "Settings")
tester().tapView(withAccessibilityLabel: "Movies")
Expand Down
2 changes: 1 addition & 1 deletion CouchTrackerUITests/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>37</string>
<string>42</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion TMDBSwift-iOS/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion TMDBSwift/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019 Pietro Caselani. All rights reserved.</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion TMDBSwiftTestable/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019 Pietro Caselani. All rights reserved.</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion TMDBSwiftTests/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion TVDBSwift-iOS/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion TVDBSwift/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019 Pietro Caselani. All rights reserved.</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion TVDBSwiftTestable/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019 Pietro Caselani. All rights reserved.</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion TVDBSwiftTests/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion TraktSwift-iOS/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion TraktSwift/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019 Pietro Caselani. All rights reserved.</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion TraktSwiftTestable/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019 Pietro Caselani. All rights reserved.</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion TraktSwiftTests/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>42</string>
</dict>
</plist>
9 changes: 9 additions & 0 deletions changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# 0.0.1 (42)
* Embed missing framework [view commit](http://github.com/pietrocaselani/CouchTracker/commit/d83a059b1101589a303f1ce1f7836213f21680c4)

# 0.0.1 (41)
* Fix the UI test to handle the alert view controller [view commit](http://github.com/pietrocaselani/CouchTracker/commit/2b9abf88c9e49ba2e316b960aaf8d43a92677f5c)
* Create a fake API key instead an empty string [view commit](http://github.com/pietrocaselani/CouchTracker/commit/2fd9db1103fc6413f8b7afc2b9c3e57830cf3cca)
* Generates the secrets file before tests start [view commit](http://github.com/pietrocaselani/CouchTracker/commit/016a1341421c3990aeea8e287e8bae0cccfde2e0)
* Create a simple UI test using KIF to ensure the app always starts ok [view commit](http://github.com/pietrocaselani/CouchTracker/commit/3979a833bcf567c03cb581eb70e3973094bf409d)

# 0.0.1 (40)
* Add license scan report and status [view commit](http://github.com/pietrocaselani/CouchTracker/commit/87b66e2e587b6779a2b93310cdce40518747b3e0)

Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_secrets
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

function value_or_empty() {
[ "$1" -eq 1 ] && echo "" || echo "${2}"
[ "$1" -eq 1 ] && echo "123" || echo "${2}"
}

SCRIPT_DIR=$(echo "${BASH_SOURCE[0]}" | xargs dirname | xargs -I % sh -c 'cd % && pwd')
Expand Down

0 comments on commit fa5e2f1

Please sign in to comment.