Skip to content

Commit

Permalink
Merge pull request #20 from sematext/remove_unused_libs_and_add_tvos_…
Browse files Browse the repository at this point in the history
…and_watchos_support

Remove unused libs and add tvos and watchos support
  • Loading branch information
Rafał Kuć authored Nov 10, 2020
2 parents 9de9690 + d58e5ec commit e0a7d41
Show file tree
Hide file tree
Showing 15 changed files with 855 additions and 71 deletions.
51 changes: 15 additions & 36 deletions Example/Logsene.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
607FACEC1AFB9204008FA782 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; };
DC404DB57F3176A0C3184227 /* Pods_Logsene_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE9145C832184A63B354EC5C /* Pods_Logsene_Tests.framework */; };
DDC2E63426FC7816D52AE606 /* Pods_Logsene_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2196FBCFADB0A5475B8FBAE /* Pods_Logsene_Tests.framework */; };
EE4DF9BB71B2BA01E774FA8C /* Pods_Logsene_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BBAB8007A53A990DA01031E /* Pods_Logsene_Example.framework */; };
/* End PBXBuildFile section */

Expand All @@ -34,7 +34,6 @@
115B97F770A95591FBBE76A3 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
1CBD0BA024549F14005016C7 /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
1CBD0BA224549FA9005016C7 /* TestActionsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestActionsController.swift; sourceTree = "<group>"; };
2CC997AC234EA35933B87FD1 /* Pods-Logsene_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Logsene_Tests.debug.xcconfig"; path = "Target Support Files/Pods-Logsene_Tests/Pods-Logsene_Tests.debug.xcconfig"; sourceTree = "<group>"; };
607FACD01AFB9204008FA782 /* Logsene_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Logsene_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -45,11 +44,12 @@
607FACE51AFB9204008FA782 /* Logsene_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Logsene_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = "<group>"; };
88F9F7A5D40655CCBB7006DD /* Pods-Logsene_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Logsene_Tests.debug.xcconfig"; path = "Target Support Files/Pods-Logsene_Tests/Pods-Logsene_Tests.debug.xcconfig"; sourceTree = "<group>"; };
9C720C4242C71A8C6F6B68BB /* Logsene.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Logsene.podspec; path = ../Logsene.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
CE9145C832184A63B354EC5C /* Pods_Logsene_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Logsene_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A2196FBCFADB0A5475B8FBAE /* Pods_Logsene_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Logsene_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BF493A750CFBFFB060312FF1 /* Pods-Logsene_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Logsene_Tests.release.xcconfig"; path = "Target Support Files/Pods-Logsene_Tests/Pods-Logsene_Tests.release.xcconfig"; sourceTree = "<group>"; };
CEB77BF41D0B6019CF989DAD /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
E009C445593066D7119D5B0F /* Pods-Logsene_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Logsene_Example.release.xcconfig"; path = "Target Support Files/Pods-Logsene_Example/Pods-Logsene_Example.release.xcconfig"; sourceTree = "<group>"; };
E928E12D475C7124EFD6031D /* Pods-Logsene_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Logsene_Tests.release.xcconfig"; path = "Target Support Files/Pods-Logsene_Tests/Pods-Logsene_Tests.release.xcconfig"; sourceTree = "<group>"; };
EB7F33A292BC01C0C5420F28 /* Pods-Logsene_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Logsene_Example.debug.xcconfig"; path = "Target Support Files/Pods-Logsene_Example/Pods-Logsene_Example.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -66,7 +66,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DC404DB57F3176A0C3184227 /* Pods_Logsene_Tests.framework in Frameworks */,
DDC2E63426FC7816D52AE606 /* Pods_Logsene_Tests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -77,7 +77,7 @@
isa = PBXGroup;
children = (
0BBAB8007A53A990DA01031E /* Pods_Logsene_Example.framework */,
CE9145C832184A63B354EC5C /* Pods_Logsene_Tests.framework */,
A2196FBCFADB0A5475B8FBAE /* Pods_Logsene_Tests.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -159,8 +159,8 @@
children = (
EB7F33A292BC01C0C5420F28 /* Pods-Logsene_Example.debug.xcconfig */,
E009C445593066D7119D5B0F /* Pods-Logsene_Example.release.xcconfig */,
2CC997AC234EA35933B87FD1 /* Pods-Logsene_Tests.debug.xcconfig */,
E928E12D475C7124EFD6031D /* Pods-Logsene_Tests.release.xcconfig */,
88F9F7A5D40655CCBB7006DD /* Pods-Logsene_Tests.debug.xcconfig */,
BF493A750CFBFFB060312FF1 /* Pods-Logsene_Tests.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
Expand Down Expand Up @@ -191,11 +191,10 @@
isa = PBXNativeTarget;
buildConfigurationList = 607FACF21AFB9204008FA782 /* Build configuration list for PBXNativeTarget "Logsene_Tests" */;
buildPhases = (
AA71EC6420585D08C9E23C2B /* [CP] Check Pods Manifest.lock */,
76463F69F7DF5A38A2EE2A5B /* [CP] Check Pods Manifest.lock */,
607FACE11AFB9204008FA782 /* Sources */,
607FACE21AFB9204008FA782 /* Frameworks */,
607FACE31AFB9204008FA782 /* Resources */,
E93DEE48770A720AF21C9494 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -268,7 +267,7 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
A24530DED69C5F5BCDC01B51 /* [CP] Check Pods Manifest.lock */ = {
76463F69F7DF5A38A2EE2A5B /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -283,14 +282,14 @@
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Logsene_Example-checkManifestLockResult.txt",
"$(DERIVED_FILE_DIR)/Pods-Logsene_Tests-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
AA71EC6420585D08C9E23C2B /* [CP] Check Pods Manifest.lock */ = {
A24530DED69C5F5BCDC01B51 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -305,33 +304,13 @@
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Logsene_Tests-checkManifestLockResult.txt",
"$(DERIVED_FILE_DIR)/Pods-Logsene_Example-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
E93DEE48770A720AF21C9494 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Logsene_Tests/Pods-Logsene_Tests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Logsene_Tests/Pods-Logsene_Tests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
F9B81E928F231E62A08F9170 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -549,7 +528,7 @@
};
607FACF31AFB9204008FA782 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2CC997AC234EA35933B87FD1 /* Pods-Logsene_Tests.debug.xcconfig */;
baseConfigurationReference = 88F9F7A5D40655CCBB7006DD /* Pods-Logsene_Tests.debug.xcconfig */;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(PLATFORM_DIR)/Developer/Library/Frameworks",
Expand All @@ -571,7 +550,7 @@
};
607FACF41AFB9204008FA782 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = E928E12D475C7124EFD6031D /* Pods-Logsene_Tests.release.xcconfig */;
baseConfigurationReference = BF493A750CFBFFB060312FF1 /* Pods-Logsene_Tests.release.xcconfig */;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(PLATFORM_DIR)/Developer/Library/Frameworks",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1200"
LastUpgradeVersion = "1210"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
3 changes: 0 additions & 3 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ target 'Logsene_Example' do

target 'Logsene_Tests' do
inherit! :search_paths

pod 'Quick', '~> 3.0'
pod 'Nimble', '~> 9.0'
end
end

Expand Down
15 changes: 3 additions & 12 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,15 @@ PODS:
- CocoaLumberjack/Core (3.6.1)
- CocoaLumberjack/Swift (3.6.1):
- CocoaLumberjack/Core
- Logsene (1.6.0)
- Nimble (9.0.0)
- Quick (3.0.0)
- Logsene (1.6.1)

DEPENDENCIES:
- CocoaLumberjack/Swift
- Logsene (from `../`)
- Nimble (~> 9.0)
- Quick (~> 3.0)

SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
- CocoaLumberjack
trunk:
- Nimble
- Quick

EXTERNAL SOURCES:
Logsene:
Expand All @@ -26,10 +19,8 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
CocoaLumberjack: b17ae15142558d08bbacf69775fa10c4abbebcc9
Logsene: e537b4158aff29cabd9be050aabda5d7d35f0cc1
Nimble: 3b4ec3fd40f1dc178058e0981107721c615643d8
Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2
Logsene: afed1d1d48881f9c5d8261e75caf74d806ffc1b4

PODFILE CHECKSUM: 24ea5f0942d1fdc3553f9c0e04fa216ae7938808
PODFILE CHECKSUM: 6216c40be1df587984d8c9469884a257bbac56af

COCOAPODS: 1.9.3
24 changes: 18 additions & 6 deletions Example/Tests/Tests.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
// https://github.com/Quick/Quick

import Quick
import Nimble
import Logsene
import XCTest

class TableOfContentsSpec: QuickSpec {
override func spec() {
class LogseneTests: XCTestCase {
override func setUp() {
super.setUp()
}

override func tearDown() {
super.tearDown()
}

func testExample() {
XCTAssertTrue(true)
}

func testLogsene() {
try! LogseneInit("du72esds-s21s-xws2-2sww-sas1dwsa12sa", type: "example")
LLogInfo("Sample message")
XCTAssertTrue(true)
}
}
4 changes: 3 additions & 1 deletion Logsene.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'Logsene'
s.version = '1.6.0'
s.version = '1.6.1'
s.summary = 'Sematext Cloud Logs is ELK as a Service. This library lets you collect mobile analytics and log data from your iOS applications.'

s.description = <<-DESC
Expand All @@ -25,6 +25,8 @@ Pod::Spec.new do |s|

s.ios.deployment_target = '12.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '12.0'
s.watchos.deployment_target = '5.0'
s.source_files = 'Logsene/Classes/**/*'

s.swift_versions = ['4.0', '4.1', '4.2', '5.0', '5.1', '5.2']
Expand Down
25 changes: 25 additions & 0 deletions Logsene.xcodeproj/Example_Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
25 changes: 25 additions & 0 deletions Logsene.xcodeproj/Logsene_Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
Loading

0 comments on commit e0a7d41

Please sign in to comment.