Merge pull request #5 from swordfishyou/develop

Vadym Kurachevskyi · web-flow · commit 983abbc1c462 · 2020-02-22T15:42:27.000+02:00
Rename UserReport module to UserReportSDK
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+Example/Example.xcodeproj/xcuserdata
+Example_Objective-C/Example_Objective-C.xcodeproj/xcuserdata
+UserReport.xcworkspace/xcuserdata
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1107472C1F44986500150955 /* UserReport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1107472B1F44986500150955 /* UserReport.framework */; };
 		1115E4FA1F72866D00ED6F6B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1115E4F81F72862F00ED6F6B /* Main.storyboard */; };
 		11297A161F68080E0033E3E8 /* TimeInterval+stringTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11297A151F68080E0033E3E8 /* TimeInterval+stringTime.swift */; };
 		1141EF421F62CE170011D10F /* ShadowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1141EF411F62CE170011D10F /* ShadowView.swift */; };
@@ -17,6 +16,7 @@
 		116BD15A1F58130A00D2386B /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 116BD14F1F58130A00D2386B /* ViewController.swift */; };
 		116BD15B1F58130A00D2386B /* VerticalButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 116BD1511F58130A00D2386B /* VerticalButton.swift */; };
 		116BD1681F5814C500D2386B /* UserReport_ExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 116BD1541F58130A00D2386B /* UserReport_ExampleTests.swift */; };
+		325E737B240165B20015F9C6 /* UserReportSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 325E737A240165B20015F9C6 /* UserReportSDK.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -45,14 +45,15 @@
 		116BD1511F58130A00D2386B /* VerticalButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VerticalButton.swift; sourceTree = "<group>"; };
 		116BD1531F58130A00D2386B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		116BD1541F58130A00D2386B /* UserReport_ExampleTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserReport_ExampleTests.swift; sourceTree = "<group>"; };
+		325E737A240165B20015F9C6 /* UserReportSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UserReportSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		110746E01F4492E700150955 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1107472C1F44986500150955 /* UserReport.framework in Frameworks */,
+				325E737B240165B20015F9C6 /* UserReportSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -88,6 +89,7 @@
 		1107472A1F44986500150955 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				325E737A240165B20015F9C6 /* UserReportSDK.framework */,
 				1115E5011F728B6D00ED6F6B /* MobileCoreServices.framework */,
 				1107472B1F44986500150955 /* UserReport.framework */,
 			);
diff --git a/Example/Example/AppDelegate.swift b/Example/Example/AppDelegate.swift
@@ -3,7 +3,7 @@
 //
 
 import UIKit
-import UserReport
+import UserReportSDK
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
diff --git a/Example/Example/ViewController.swift b/Example/Example/ViewController.swift
@@ -3,7 +3,7 @@
 //
 
 import UIKit
-import UserReport
+import UserReportSDK
 
 class ViewController: UserReportViewController {
     
diff --git a/Example_Objective-C/Example_Objective-C.xcodeproj/project.pbxproj b/Example_Objective-C/Example_Objective-C.xcodeproj/project.pbxproj
@@ -14,8 +14,8 @@
 		116C895C2305A85D003E17E5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 116C895B2305A85D003E17E5 /* Assets.xcassets */; };
 		116C895F2305A85D003E17E5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 116C895D2305A85D003E17E5 /* LaunchScreen.storyboard */; };
 		116C89622305A85D003E17E5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 116C89612305A85D003E17E5 /* main.m */; };
-		116C896C2305AA23003E17E5 /* UserReport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 116C896B2305AA23003E17E5 /* UserReport.framework */; };
 		116C89752305BBF7003E17E5 /* VerticalButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 116C89742305BBF7003E17E5 /* VerticalButton.m */; };
+		325E737F240165F90015F9C6 /* UserReportSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 325E737E240165F90015F9C6 /* UserReportSDK.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -34,14 +34,15 @@
 		116C896B2305AA23003E17E5 /* UserReport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UserReport.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		116C89732305BBF7003E17E5 /* VerticalButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VerticalButton.h; sourceTree = "<group>"; };
 		116C89742305BBF7003E17E5 /* VerticalButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VerticalButton.m; sourceTree = "<group>"; };
+		325E737E240165F90015F9C6 /* UserReportSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UserReportSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		116C894C2305A85B003E17E5 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				116C896C2305AA23003E17E5 /* UserReport.framework in Frameworks */,
+				325E737F240165F90015F9C6 /* UserReportSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -94,6 +95,7 @@
 		116C896A2305AA23003E17E5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				325E737E240165F90015F9C6 /* UserReportSDK.framework */,
 				116C896B2305AA23003E17E5 /* UserReport.framework */,
 			);
 			name = Frameworks;
diff --git a/Example_Objective-C/Example_Objective-C/AppDelegate.m b/Example_Objective-C/Example_Objective-C/AppDelegate.m
@@ -3,7 +3,7 @@
 //
 
 #import "AppDelegate.h"
-#import <UserReport/UserReport-Swift.h>
+#import <UserReportSDK/UserReportSDK-Swift.h>
 
 @interface AppDelegate ()
 
diff --git a/Example_Objective-C/Example_Objective-C/ViewController.m b/Example_Objective-C/Example_Objective-C/ViewController.m
@@ -3,7 +3,7 @@
 //
 
 #import "ViewController.h"
-#import <UserReport/UserReport-Swift.h>
+#import <UserReportSDK/UserReportSDK-Swift.h>
 
 @interface ViewController ()
 @property (nullable ,strong, nonatomic) NSTimer *timer;
diff --git a/UserReport.xcworkspace/contents.xcworkspacedata b/UserReport.xcworkspace/contents.xcworkspacedata
diff --git a/UserReport/UserReport/Models/Device.swift b/UserReport/UserReport/Models/Device.swift
@@ -3,6 +3,7 @@
 //
 
 import Foundation
+import UIKit
 
 /**
  * Information about the current device
diff --git a/UserReport/UserReport/Session/Session.swift b/UserReport/UserReport/Session/Session.swift
@@ -3,6 +3,7 @@
 //
 
 import Foundation
+import UIKit
 
 /**
  *   Class stores the data on the count of screens viewed and the time the application is used
diff --git a/UserReport/UserReport/UserReport.swift b/UserReport/UserReport/UserReport.swift
@@ -3,6 +3,7 @@
 //
 
 import Foundation
+import UIKit
 
 /// Display style of the survey view on the screen
 @objc public enum DisplayMode: Int {
diff --git a/UserReport/UserReportSDK.xcodeproj/project.pbxproj b/UserReport/UserReportSDK.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		110746CA1F44921900150955 /* UserReport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 110746C01F44921900150955 /* UserReport.framework */; };
+		110746CA1F44921900150955 /* UserReportSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 110746C01F44921900150955 /* UserReportSDK.framework */; };
 		110746D11F44921900150955 /* UserReport.h in Headers */ = {isa = PBXBuildFile; fileRef = 110746C31F44921900150955 /* UserReport.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		110747281F44953000150955 /* UserReport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110747271F44953000150955 /* UserReport.swift */; };
 		1107473A1F46FA6800150955 /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 110747361F46FA6800150955 /* Network.swift */; };
@@ -46,7 +46,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		110746C01F44921900150955 /* UserReport.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = UserReport.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		110746C01F44921900150955 /* UserReportSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = UserReportSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		110746C31F44921900150955 /* UserReport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserReport.h; sourceTree = "<group>"; };
 		110746C41F44921900150955 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		110746C91F44921900150955 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -94,7 +94,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				116BD1661F5814A800D2386B /* XCTest.framework in Frameworks */,
-				110746CA1F44921900150955 /* UserReport.framework in Frameworks */,
+				110746CA1F44921900150955 /* UserReportSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -114,7 +114,7 @@
 		110746C11F44921900150955 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				110746C01F44921900150955 /* UserReport.framework */,
+				110746C01F44921900150955 /* UserReportSDK.framework */,
 				110746C91F44921900150955 /* Tests.xctest */,
 			);
 			name = Products;
@@ -231,9 +231,9 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		110746BF1F44921900150955 /* UserReport */ = {
+		110746BF1F44921900150955 /* UserReportSDK */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 110746D41F44921900150955 /* Build configuration list for PBXNativeTarget "UserReport" */;
+			buildConfigurationList = 110746D41F44921900150955 /* Build configuration list for PBXNativeTarget "UserReportSDK" */;
 			buildPhases = (
 				110746BB1F44921900150955 /* Sources */,
 				110746BC1F44921900150955 /* Frameworks */,
@@ -244,9 +244,9 @@
 			);
 			dependencies = (
 			);
-			name = UserReport;
+			name = UserReportSDK;
 			productName = UserReport;
-			productReference = 110746C01F44921900150955 /* UserReport.framework */;
+			productReference = 110746C01F44921900150955 /* UserReportSDK.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 		110746C81F44921900150955 /* Tests */ = {
@@ -288,7 +288,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 110746BA1F44921900150955 /* Build configuration list for PBXProject "UserReport" */;
+			buildConfigurationList = 110746BA1F44921900150955 /* Build configuration list for PBXProject "UserReportSDK" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -301,7 +301,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				110746BF1F44921900150955 /* UserReport */,
+				110746BF1F44921900150955 /* UserReportSDK */,
 				110746C81F44921900150955 /* Tests */,
 			);
 		};
@@ -364,7 +364,7 @@
 /* Begin PBXTargetDependency section */
 		110746CC1F44921900150955 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 110746BF1F44921900150955 /* UserReport */;
+			target = 110746BF1F44921900150955 /* UserReportSDK */;
 			targetProxy = 110746CB1F44921900150955 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
@@ -557,7 +557,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		110746BA1F44921900150955 /* Build configuration list for PBXProject "UserReport" */ = {
+		110746BA1F44921900150955 /* Build configuration list for PBXProject "UserReportSDK" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				110746D21F44921900150955 /* Debug */,
@@ -566,7 +566,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		110746D41F44921900150955 /* Build configuration list for PBXNativeTarget "UserReport" */ = {
+		110746D41F44921900150955 /* Build configuration list for PBXNativeTarget "UserReportSDK" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				110746D51F44921900150955 /* Debug */,
diff --git a/UserReport/UserReportSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/UserReport/UserReportSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/UserReport/UserReportSDK.xcodeproj/project.xcworkspace/xcuserdata/Alexander.xcuserdatad/UserInterfaceState.xcuserstate b/UserReport/UserReportSDK.xcodeproj/project.xcworkspace/xcuserdata/Alexander.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/UserReport/UserReportSDK.xcodeproj/xcshareddata/xcschemes/UserReportSDK.xcscheme b/UserReport/UserReportSDK.xcodeproj/xcshareddata/xcschemes/UserReportSDK.xcscheme
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1130"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "110746BF1F44921900150955"
+               BuildableName = "UserReportSDK.framework"
+               BlueprintName = "UserReportSDK"
+               ReferencedContainer = "container:UserReportSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "110746C81F44921900150955"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
+               ReferencedContainer = "container:UserReportSDK.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "110746BF1F44921900150955"
+            BuildableName = "UserReportSDK.framework"
+            BlueprintName = "UserReportSDK"
+            ReferencedContainer = "container:UserReportSDK.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/UserReport/UserReportSDK.xcodeproj/xcuserdata/Alexander.xcuserdatad/xcschemes/UserReport.xcscheme b/UserReport/UserReportSDK.xcodeproj/xcuserdata/Alexander.xcuserdatad/xcschemes/UserReport.xcscheme
diff --git a/UserReport/UserReportSDK.xcodeproj/xcuserdata/Alexander.xcuserdatad/xcschemes/xcschememanagement.plist b/UserReport/UserReportSDK.xcodeproj/xcuserdata/Alexander.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/UserReport/UserReportSDK.xcodeproj/xcuserdata/atu.xcuserdatad/xcschemes/xcschememanagement.plist b/UserReport/UserReportSDK.xcodeproj/xcuserdata/atu.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>UserReportSDK.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>110746BF1F44921900150955</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>110746C81F44921900150955</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Example/Example.xcodeproj/xcuserdata`
	`2`	`+Example_Objective-C/Example_Objective-C.xcodeproj/xcuserdata`
	`3`	`+UserReport.xcworkspace/xcuserdata`