mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

examples/docs: update android applications to the latest relevant sdk's and build tools

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1622>
This commit is contained in:
Matthew Waters 2022-02-02 13:36:41 +11:00 committed by GStreamer Marge Bot
parent 6434d69f8c
commit 2f9ad38118
19 changed files with 40 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/AndroidManifest.xml
View file

@ -3,11 +3,12 @@
package="org.freedesktop.gstreamer.tutorials.tutorial_1"
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
<application android:label="@string/app_name"
android:icon="@drawable/gstreamer_logo_1">
<activity android:name=".Tutorial1"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

5
subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/build.gradle
View file

@ -1,13 +1,12 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 23
buildToolsVersion '27.0.3'
compileSdkVersion 32
defaultConfig {
applicationId "org.freedesktop.gstreamer.tutorials.tutorial_1"
minSdkVersion 15
targetSdkVersion 15
targetSdkVersion 32
versionCode 1
versionName "1.0"

5
subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/AndroidManifest.xml
View file

@ -3,11 +3,12 @@
package="org.freedesktop.gstreamer.tutorials.tutorial_2"
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
<application android:label="@string/app_name"
android:icon="@drawable/gstreamer_logo_2">
<activity android:name=".Tutorial2"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

5
subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/build.gradle
View file

@ -1,13 +1,12 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 23
buildToolsVersion '27.0.3'
compileSdkVersion 32
defaultConfig {
applicationId "org.freedesktop.gstreamer.tutorials.tutorial_2"
minSdkVersion 15
targetSdkVersion 15
targetSdkVersion 32
versionCode 1
versionName "1.0"

5
subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/AndroidManifest.xml
View file

@ -3,12 +3,13 @@
package="org.freedesktop.gstreamer.tutorials.tutorial_3"
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
<uses-feature android:glEsVersion="0x00020000"/>
<application android:label="@string/app_name"
android:icon="@drawable/gstreamer_logo_3">
<activity android:name=".Tutorial3"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

5
subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/build.gradle
View file

@ -1,13 +1,12 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 23
buildToolsVersion '27.0.3'
compileSdkVersion 32
defaultConfig {
applicationId "org.freedesktop.gstreamer.tutorials.tutorial_3"
minSdkVersion 15
targetSdkVersion 15
targetSdkVersion 32
versionCode 1
versionName "1.0"

5
subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/AndroidManifest.xml
View file

@ -3,13 +3,14 @@
package="org.freedesktop.gstreamer.tutorials.tutorial_4"
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-feature android:glEsVersion="0x00020000"/>
<application android:label="@string/app_name"
android:icon="@drawable/gstreamer_logo_4">
<activity android:name=".Tutorial4"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

5
subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/build.gradle
View file

@ -1,13 +1,12 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 23
buildToolsVersion '27.0.3'
compileSdkVersion 32
defaultConfig {
applicationId "org.freedesktop.gstreamer.tutorials.tutorial_4"
minSdkVersion 15
targetSdkVersion 15
targetSdkVersion 32
versionCode 1
versionName "1.0"

7
subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/AndroidManifest.xml
View file

@ -4,10 +4,6 @@
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="14" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
@ -18,7 +14,8 @@
android:label="@string/app_name" >
<activity
android:name=".Tutorial5"
android:label="@string/app_name" >
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

5
subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/build.gradle
View file

@ -1,13 +1,12 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 23
buildToolsVersion '27.0.3'
compileSdkVersion 32
defaultConfig {
applicationId "org.freedesktop.gstreamer.tutorials.tutorial_5"
minSdkVersion 15
targetSdkVersion 15
targetSdkVersion 32
versionCode 1
versionName "1.0"

2
subprojects/gst-docs/examples/tutorials/android/build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:7.1.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

2
subprojects/gst-docs/examples/tutorials/android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

3
subprojects/gst-examples/vulkan/android/AndroidManifest.xml
View file

@ -6,7 +6,8 @@
android:required="true"/>
<application android:label="@string/app_name">
<activity android:name="org.freedesktop.gstreamer.vulkan.Vulkan1"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

9
subprojects/gst-examples/vulkan/android/build.gradle
View file

@ -1,13 +1,12 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 24
buildToolsVersion '28.0.3'
compileSdkVersion 32
defaultConfig {
applicationId "org.freedesktop.gstreamer.vulkan.vulkan_1"
minSdkVersion 24
targetSdkVersion 24
targetSdkVersion 32
versionCode 1
versionName "1.0"
archivesBaseName = "$applicationId-v$versionCode"
@ -79,11 +78,11 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:7.1.0'
}
}
repositories {
jcenter()
google()
}
}

2
subprojects/gst-examples/vulkan/android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

4
subprojects/gst-examples/webrtc/android/app/build.gradle
View file

@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 23
compileSdkVersion 32
defaultConfig {
applicationId "org.freedesktop.gstreamer.webrtc"
minSdkVersion 15
targetSdkVersion 15
targetSdkVersion 32
versionCode 1
versionName "1.0"
archivesBaseName = "$applicationId-v$versionCode"

5
subprojects/gst-examples/webrtc/android/app/src/main/AndroidManifest.xml
View file

@ -12,7 +12,8 @@
<application android:label="@string/app_name">
<activity android:name=".WebRTC"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<!-- Files whose MIME type is known to Android -->
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -24,4 +25,4 @@
</activity>
</application>
</manifest>
</manifest>

13
subprojects/gst-examples/webrtc/android/build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.android.tools.build:gradle:7.1.0'
}
}
@ -20,14 +20,3 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}
ext {
supportLibVersion = '27.1.1' // variable that can be referenced to keep support libs consistent
commonLibVersion= '2.12.4'
versionBuildTool = '28.0.3'
versionCompiler = 28
versionTarget = 27
versionNameString = '1.0.0'
javaSourceCompatibility = JavaVersion.VERSION_1_8
javaTargetCompatibility = JavaVersion.VERSION_1_8
}

2
subprojects/gst-examples/webrtc/android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip