Test application versions updated.

tanersener · Aug 30, 2018 · f226cd6 · f226cd6
1 parent 0d02689
commit f226cd6
Show file tree

Hide file tree

Showing 7 changed files with 119 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -91,9 +91,9 @@ There is an Android test application under the `android/test-app` folder and an
 
 ### 3. Versions
 
-- `MobileFFmpeg v1.x` is the current stable, includes `FFmpeg v3.4.4`
+- `MobileFFmpeg v1.x` is the previous stable, includes `FFmpeg v3.4.4`
 
-- `MobileFFmpeg v2.x` is the next stable, includes `FFmpeg v4.0.2`
+- `MobileFFmpeg v2.x` is the current stable, includes `FFmpeg v4.0.2`
 
 ### 4. Building
 #### 4.1 Prerequisites

diff --git a/ios/test-app/MobileFFmpegTest.xcodeproj/project.pbxproj b/ios/test-app/MobileFFmpegTest.xcodeproj/project.pbxproj
@@ -238,15 +238,15 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-MobileFFmpegTest/Pods-MobileFFmpegTest-frameworks.sh",
-				"${PODS_ROOT}/mobile-ffmpeg-full-gpl/mobileffmpeg.framework",
-				"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libavcodec.framework",
-				"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libavdevice.framework",
-				"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libavfilter.framework",
-				"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libavformat.framework",
-				"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libavutil.framework",
-				"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libswresample.framework",
-				"${PODS_ROOT}/mobile-ffmpeg-full-gpl/libswscale.framework",
+				"${PODS_ROOT}/Target Support Files/Pods-MobileFFmpegTest/Pods-MobileFFmpegTest-frameworks.sh",
+				"${PODS_ROOT}/mobile-ffmpeg-full/mobileffmpeg.framework",
+				"${PODS_ROOT}/mobile-ffmpeg-full/libavcodec.framework",
+				"${PODS_ROOT}/mobile-ffmpeg-full/libavdevice.framework",
+				"${PODS_ROOT}/mobile-ffmpeg-full/libavfilter.framework",
+				"${PODS_ROOT}/mobile-ffmpeg-full/libavformat.framework",
+				"${PODS_ROOT}/mobile-ffmpeg-full/libavutil.framework",
+				"${PODS_ROOT}/mobile-ffmpeg-full/libswresample.framework",
+				"${PODS_ROOT}/mobile-ffmpeg-full/libswscale.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -261,7 +261,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MobileFFmpegTest/Pods-MobileFFmpegTest-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MobileFFmpegTest/Pods-MobileFFmpegTest-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/...bileFFmpegTest.xcodeproj/xcuserdata/taner.xcuserdatad/xcschemes/MobileFFmpegTest.xcscheme b/...bileFFmpegTest.xcodeproj/xcuserdata/taner.xcuserdatad/xcschemes/MobileFFmpegTest.xcscheme
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0940"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "34FAE20F209F7DDD005CE2AE"
+               BuildableName = "MobileFFmpegTest.app"
+               BlueprintName = "MobileFFmpegTest"
+               ReferencedContainer = "container:MobileFFmpegTest.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "34FAE20F209F7DDD005CE2AE"
+            BuildableName = "MobileFFmpegTest.app"
+            BlueprintName = "MobileFFmpegTest"
+            ReferencedContainer = "container:MobileFFmpegTest.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </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">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "34FAE20F209F7DDD005CE2AE"
+            BuildableName = "MobileFFmpegTest.app"
+            BlueprintName = "MobileFFmpegTest"
+            ReferencedContainer = "container:MobileFFmpegTest.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "34FAE20F209F7DDD005CE2AE"
+            BuildableName = "MobileFFmpegTest.app"
+            BlueprintName = "MobileFFmpegTest"
+            ReferencedContainer = "container:MobileFFmpegTest.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...obileFFmpegTest.xcodeproj/xcuserdata/taner.xcuserdatad/xcschemes/xcschememanagement.plist b/...obileFFmpegTest.xcodeproj/xcuserdata/taner.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,15 @@
 		<key>MobileFFmpegTest.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>34FAE20F209F7DDD005CE2AE</key>
+		<dict>
+			<key>primary</key>
+			<true/>
 		</dict>
 	</dict>
 </dict>

diff --git a/.../MobileFFmpegTest.xcworkspace/xcuserdata/taner.xcuserdatad/UserInterfaceState.xcuserstate b/.../MobileFFmpegTest.xcworkspace/xcuserdata/taner.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ios/test-app/Podfile b/ios/test-app/Podfile
@@ -3,5 +3,5 @@ platform :ios, '8.0'
 use_frameworks!
 
 target "MobileFFmpegTest" do
-    pod 'mobile-ffmpeg-full-gpl', '~> 1.1'
+    pod 'mobile-ffmpeg-full', '~> 1.2'
 end
diff --git a/ios/test-app/Podfile.lock b/ios/test-app/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - mobile-ffmpeg-full-gpl (1.1)
+  - mobile-ffmpeg-full (1.2)
 
 DEPENDENCIES:
-  - mobile-ffmpeg-full-gpl (~> 1.0)
+  - mobile-ffmpeg-full (~> 1.2)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
-    - mobile-ffmpeg-full-gpl
+    - mobile-ffmpeg-full
 
 SPEC CHECKSUMS:
-  mobile-ffmpeg-full-gpl: 11966d35b838105a2a7a7a406273bb1d96471e77
+  mobile-ffmpeg-full: ec899dc6429f90601ccadf6dbe555a920807f231
 
-PODFILE CHECKSUM: cec5abc94e85ec6e626417604d91207043765613
+PODFILE CHECKSUM: e71a0e0713180c5304f217b8a1ccf7dcf3c06e16
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.0.beta.1