Merge pull request #21 from lawder/release/v2.1.1

Release v2.1.1
pili-engineering · Mar 27, 2019 · 1a92ca8 · 1a92ca8
2 parents 8aeabdb + 3e8a06b
commit 1a92ca8
Show file tree

Hide file tree

Showing 50 changed files with 1,582 additions and 1,287 deletions.
diff --git a/APIDiffs/api-diffs-2.1.1.md b/APIDiffs/api-diffs-2.1.1.md
@@ -0,0 +1,17 @@
+# QNRTCKit 2.1.0 to 2.1.1 API Differences
+
+```
+QNTrackINfo.h
+```
+
+- *Added* `- (void)setMaintainResolutionEnabled:(BOOL)enabled;`
+
+```
+QNVideoView.h
+```
+
+- *Added* `@property(nonatomic, assign) QNVideoFillModeType fillMode;`
+
+
+
+
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -6,7 +6,7 @@ PODS:
  - PLPlayerKit (3.3.2):
  - PLPlayerKit/iphoneos (= 3.3.2)
  - PLPlayerKit/iphoneos (3.3.2)
- - QNRTCKit (2.1.0)
+ - QNRTCKit (2.1.1)
 
 DEPENDENCIES:
  - Bugsnag (= 5.15.4)
@@ -34,8 +34,8 @@ SPEC CHECKSUMS:
  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
  MMMaterialDesignSpinner: a548042720c2e5f04212048483085d7942ac3e81
  PLPlayerKit: 70b3866a615de26030e9c81316f6807b1a8b1808
- QNRTCKit: 30005fc65b7b220c085ea454add54de8c833af19
+ QNRTCKit: 6dc69aa48f326033d671990e411450bfc6040608
 
 PODFILE CHECKSUM: 219bc30c36e73e22e59a5caa3795d5a813566e2f
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.0
diff --git a/Example/Pods/Headers/Public/PLPlayerKit/PLPlayerKit/PLPlayer.h b/Example/Pods/Headers/Public/PLPlayerKit/PLPlayerKit/PLPlayer.h
diff --git a/Example/Pods/Headers/Public/PLPlayerKit/PLPlayerKit/PLPlayerError.h b/Example/Pods/Headers/Public/PLPlayerKit/PLPlayerKit/PLPlayerError.h
diff --git a/Example/Pods/Headers/Public/PLPlayerKit/PLPlayerKit/PLPlayerKit.h b/Example/Pods/Headers/Public/PLPlayerKit/PLPlayerKit/PLPlayerKit.h
diff --git a/Example/Pods/Headers/Public/PLPlayerKit/PLPlayerKit/PLPlayerOption.h b/Example/Pods/Headers/Public/PLPlayerKit/PLPlayerKit/PLPlayerOption.h
diff --git a/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNMergeStreamConfiguration.h b/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNMergeStreamConfiguration.h
diff --git a/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNMergeStreamLayout.h b/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNMergeStreamLayout.h
diff --git a/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNRTCEngine.h b/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNRTCEngine.h
diff --git a/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNRTCKit.h b/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNRTCKit.h
diff --git a/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNRTCSession.h b/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNRTCSession.h
diff --git a/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNTrackInfo.h b/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNTrackInfo.h
diff --git a/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNTypeDefines.h b/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNTypeDefines.h
diff --git a/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNUtil.h b/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNUtil.h
diff --git a/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNVideoRender.h b/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNVideoRender.h
diff --git a/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNVideoView.h b/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNVideoView.h
diff --git a/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNWatermarkInfo.h b/Example/Pods/Headers/Public/QNRTCKit/QNRTCKit/QNWatermarkInfo.h
diff --git a/Example/Pods/Local Podspecs/QNRTCKit.podspec.json b/Example/Pods/Local Podspecs/QNRTCKit.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/Bugsnag/Bugsnag.xcconfig b/Example/Pods/Target Support Files/Bugsnag/Bugsnag.xcconfig
diff --git a/Example/Pods/Target Support Files/JGProgressHUD/JGProgressHUD.xcconfig b/Example/Pods/Target Support Files/JGProgressHUD/JGProgressHUD.xcconfig
diff --git a/.../Target Support Files/JGProgressHUD/ResourceBundle-JGProgressHUD-JGProgressHUD-Info.plist b/.../Target Support Files/JGProgressHUD/ResourceBundle-JGProgressHUD-JGProgressHUD-Info.plist
diff --git a/Example/Pods/Target Support Files/MMMaterialDesignSpinner/MMMaterialDesignSpinner.xcconfig b/Example/Pods/Target Support Files/MMMaterialDesignSpinner/MMMaterialDesignSpinner.xcconfig
diff --git a/Example/Pods/Target Support Files/Masonry/Masonry.xcconfig b/Example/Pods/Target Support Files/Masonry/Masonry.xcconfig
diff --git a/Example/Pods/Target Support Files/PLPlayerKit/PLPlayerKit.xcconfig b/Example/Pods/Target Support Files/PLPlayerKit/PLPlayerKit.xcconfig
diff --git a/Example/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-frameworks.sh b/Example/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-frameworks.sh
diff --git a/Example/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-resources.sh b/Example/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-resources.sh
diff --git a/Example/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo.debug.xcconfig b/Example/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo.debug.xcconfig
diff --git a/Example/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo.release.xcconfig b/Example/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo.release.xcconfig
diff --git a/Example/Pods/Target Support Files/QNRTCKit/QNRTCKit.xcconfig b/Example/Pods/Target Support Files/QNRTCKit/QNRTCKit.xcconfig
diff --git a/Example/QNRTCKitDemo.xcodeproj/project.pbxproj b/Example/QNRTCKitDemo.xcodeproj/project.pbxproj
@@ -331,7 +331,7 @@
  files = (
  );
  inputPaths = (
- "${SRCROOT}/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-resources.sh",
+ "${PODS_ROOT}/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-resources.sh",
  "${PODS_CONFIGURATION_BUILD_DIR}/JGProgressHUD/JGProgressHUD.bundle",
  );
  name = "[CP] Copy Pods Resources";
@@ -340,7 +340,7 @@
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-resources.sh\"\n";
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-resources.sh\"\n";
  showEnvVarsInLog = 0;
  };
  45FBCD51C47E0F48596AE5CC /* [CP] Embed Pods Frameworks */ = {
@@ -349,7 +349,7 @@
  files = (
  );
  inputPaths = (
- "${SRCROOT}/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-frameworks.sh",
+ "${PODS_ROOT}/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-frameworks.sh",
  "${PODS_ROOT}/PLPlayerKit/Pod/Library/PLPlayerKit.framework",
  "${PODS_ROOT}/../../Pod/iphoneos/QNRTCKit.framework",
  "${PODS_ROOT}/../../Pod/iphoneos/QNRTCKit.framework.dSYM",
@@ -362,7 +362,7 @@
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-frameworks.sh\"\n";
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QNRTCKitDemo/Pods-QNRTCKitDemo-frameworks.sh\"\n";
  showEnvVarsInLog = 0;
  };
  942A63FB5AAA43E9BE0ADEF9 /* Upload Bugsnag dSYM */ = {

diff --git a/Example/QNRTCKitDemo/Info.plist b/Example/QNRTCKitDemo/Info.plist
@@ -17,7 +17,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>2.1.0</string>
+ <string>2.1.1</string>
  <key>CFBundleVersion</key>
  <string>1</string>
  <key>LSRequiresIPhoneOS</key>