Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated deployment targets #431

Merged
merged 4 commits into from
Jul 1, 2023
Merged

Updated deployment targets #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9293c4
Updated deployment targets
brototyp Apr 8, 2023
038f094
Added changelog
brototyp Apr 8, 2023
c2d22f5
Updated macOS example app
brototyp Apr 16, 2023
342f5e7
Running actions again
brototyp Jul 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog

## Unreleased
* **improvement** Increased deployment targets to iOS 11 and macOS 10.13. [#431](https://github.com/matomo-org/matomo-sdk-ios/pull/431)

## 7.5.2
* **bugfix** Fixed an issue where the revenue of a goal wasn't sent to the server anymore. [#414](https://github.com/matomo-org/matomo-sdk-ios/issues/414)
Expand Down
2 changes: 1 addition & 1 deletion Example/ios/iOS Example/ContentViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class ContentTrackerViewController: UIViewController {

@IBAction func adInteraction(_ sender: Any) {
MatomoTracker.shared.trackContentInteraction(name: "Content name", interaction: "click", piece: "button", target: "http://dn.se")
UIApplication.shared.openURL(URL(string: "http://dn.se")!)
UIApplication.shared.open(URL(string: "http://dn.se")!)
}
}

4 changes: 2 additions & 2 deletions Example/ios/ios.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "iOS Example/Supporting Files/PiwikTrackeriOSDemo-Prefix.pch";
INFOPLIST_FILE = "iOS Example/Supporting Files/PiwikTrackeriOSDemo-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = org.matomo.iostracker;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -575,7 +575,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "iOS Example/Supporting Files/PiwikTrackeriOSDemo-Prefix.pch";
INFOPLIST_FILE = "iOS Example/Supporting Files/PiwikTrackeriOSDemo-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_CFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = org.matomo.iostracker;
Expand Down
2 changes: 2 additions & 0 deletions Example/macos/macos.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = macos/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = org.piwik.macos;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
Expand All @@ -359,6 +360,7 @@
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = macos/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = org.piwik.macos;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
Expand Down
4 changes: 2 additions & 2 deletions MatomoTracker.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Pod::Spec.new do |spec|
spec.license = { :type => 'MIT', :file => 'LICENSE.md' }
spec.author = { "Mattias Levin" => "[email protected]", "Cornelius Horstmann" => "[email protected]" }
spec.source = { :git => "https://github.com/matomo-org/matomo-sdk-ios.git", :tag => "v#{spec.version}" }
spec.ios.deployment_target = '10.0'
spec.ios.deployment_target = '11.0'
spec.tvos.deployment_target = '10.0'
spec.osx.deployment_target = '10.12'
spec.osx.deployment_target = '10.13'
spec.requires_arc = true
spec.default_subspecs = 'Core'
spec.swift_version = '5.0'
Expand Down
6 changes: 4 additions & 2 deletions MatomoTracker.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,9 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = MatomoTracker/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = org.matomo.MatomoTracker;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -610,8 +611,9 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = MatomoTracker/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = org.matomo.MatomoTracker;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down
22 changes: 9 additions & 13 deletions MatomoTracker.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions MatomoTracker.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ abstract_target :example do
workspace 'MatomoTracker'

target :iOSExampleApp do
platform :ios, '10.0'
platform :ios, '11.0'
project 'Example/ios/ios'
pod 'MatomoTracker', path: './'
end
Expand All @@ -28,7 +28,7 @@ end

target 'MatomoTrackerTests' do
use_frameworks!
platform :ios, '9.0'
platform :ios, '11.0'
inhibit_all_warnings!
project 'MatomoTracker'
workspace 'MatomoTracker'
Expand Down