From 214f1ab0f17de4262be4991f72704ca61b399f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Ma=CC=A8czewski=20=28PAMK=29?= Date: Thu, 18 Oct 2018 11:28:29 +0200 Subject: [PATCH 1/3] Added some more short variable names to allowed by swiftlint: they are used as parts of calculations --- .swiftlint.yml | 5 +++++ Source/SignalTracking/SignalTracker.swift | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index fda547e..19d3f77 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -36,4 +36,9 @@ variable_name: excluded: # excluded via string array - x - y + - i + - j + - d + - v + - a reporter: "xcode" # reporter type (xcode, json, csv, checkstyle) diff --git a/Source/SignalTracking/SignalTracker.swift b/Source/SignalTracking/SignalTracker.swift index 6e7e374..10a6153 100644 --- a/Source/SignalTracking/SignalTracker.swift +++ b/Source/SignalTracking/SignalTracker.swift @@ -16,7 +16,7 @@ public protocol SignalTracker: class { var levelThreshold: Float? { get set } var peakLevel: Float? { get } var averageLevel: Float? { get } - weak var delegate: SignalTrackerDelegate? { get set } + var delegate: SignalTrackerDelegate? { get set } func start() throws func stop() From 51bd86046027962dcc4d241463d01e5e57ce5b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Ma=CC=A8czewski=20=28PAMK=29?= Date: Thu, 18 Oct 2018 12:22:43 +0200 Subject: [PATCH 2/3] travis xcode version bump --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 95895db..ac488b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode9 +osx_image: xcode10 language: objective-c xcode_sdk: iphonesimulator10.0 From 04e4a5df582babcaae88b2c6c47443bea8ba38a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Ma=CC=A8czewski=20=28PAMK=29?= Date: Thu, 18 Oct 2018 12:42:10 +0200 Subject: [PATCH 3/3] github access token added --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac488b5..0ddf80a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,16 @@ osx_image: xcode10 language: objective-c xcode_sdk: iphonesimulator10.0 - before_install: - brew update - if brew outdated | grep -qx carthage; then brew upgrade carthage; fi - travis_wait 35 carthage bootstrap --platform iOS - script: - set -o pipefail -- travis_retry xcodebuild -project Beethoven.xcodeproj -scheme "Beethoven-iOS" -destination "platform=iOS Simulator,name=iPhone 6" build-for-testing test | xcpretty - +- travis_retry xcodebuild -project Beethoven.xcodeproj -scheme "Beethoven-iOS" -destination + "platform=iOS Simulator,name=iPhone 6" build-for-testing test | xcpretty notifications: email: false +env: + global: + secure: n8IzprXBZebE5sMmW5pltuk1Oo1StTd8kLaPuMf6Q633aAk/FKM8z0cDW6VWt8r5kFIFfdcpU86/kDaKofGb4E5was4O9gAGUKegzdDE+eHqyeDwMCKRkfEP6IP662kWSAW6iPyk63FAxkIN8QrlHbwge/kAiJ1Lze3lUfvw8jT5gucXDDdTgQ+2hc4y8t5EKHfJNYFv1RKB3TtXC5nkANyHdhXaxdYqO3yEK+rPDue/C2g/+LNdlR+wJNyyZ7L7igqQZkTChskX1y5fgYD1UElXDZvGsYXfRdaE9SprQhwkzHvCWfGOq3dbTgHWLNtYDXoy6nqe9EgD30NQZEPEGPHHv4jYHvE5njxJHu2MDXcySVJ36Niee+4Ox02OjbGZNOFE1Os1geS1lKVh8hAHqS5W3IBxQ8jui3EfQp4BpBqm9JdcuxrG/lIcGah3Ix0kRfiDXk4QT7oiypWjQX54Y0wCb0Ix0D+fR4q3Ndbrc/Eck9GYpIB6+eW1bFl+jaxWeoeTAHt/dCrTzilOgFfbw+1gBWFR76WCdoRlr3m3fAnxZvlRh42SdefMGN8XsBxmUg7lgHbP24I1FF3l6Zv2MQfiiz4dKFb6S0krR1loTgdB7foMWLdXMGk9AsgK+njCiqawALUhj9I/wJ2k1+bsD28xhJ0aRrgLbPWXmGcFBR8=