diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/AndroidManifest.xml b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/AndroidManifest.xml
index cc6f8f4b2c..c9ae093a6a 100644
--- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/AndroidManifest.xml
+++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/AndroidManifest.xml
@@ -3,11 +3,12 @@
package="org.freedesktop.gstreamer.tutorials.tutorial_1"
android:versionCode="1"
android:versionName="1.0">
-
+
+ android:label="@string/app_name"
+ android:exported="true">
diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/build.gradle b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/build.gradle
index 1b38d3ca08..7bdb45a208 100644
--- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/build.gradle
+++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-1/build.gradle
@@ -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"
diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/AndroidManifest.xml b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/AndroidManifest.xml
index cddedbf627..a61a89c028 100644
--- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/AndroidManifest.xml
+++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/AndroidManifest.xml
@@ -3,11 +3,12 @@
package="org.freedesktop.gstreamer.tutorials.tutorial_2"
android:versionCode="1"
android:versionName="1.0">
-
+
+ android:label="@string/app_name"
+ android:exported="true">
diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/build.gradle b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/build.gradle
index e2caed9a96..47bfa1a23f 100644
--- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/build.gradle
+++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-2/build.gradle
@@ -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"
diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/AndroidManifest.xml b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/AndroidManifest.xml
index 1ac1cba8e3..02518678d0 100644
--- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/AndroidManifest.xml
+++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/AndroidManifest.xml
@@ -3,12 +3,13 @@
package="org.freedesktop.gstreamer.tutorials.tutorial_3"
android:versionCode="1"
android:versionName="1.0">
-
+
+ android:label="@string/app_name"
+ android:exported="true">
diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/build.gradle b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/build.gradle
index e959dd1861..239d8f497f 100644
--- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/build.gradle
+++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-3/build.gradle
@@ -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"
diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/AndroidManifest.xml b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/AndroidManifest.xml
index aa06aab8a2..b5c2800acb 100644
--- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/AndroidManifest.xml
+++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/AndroidManifest.xml
@@ -3,13 +3,14 @@
package="org.freedesktop.gstreamer.tutorials.tutorial_4"
android:versionCode="1"
android:versionName="1.0">
-
+
+ android:label="@string/app_name"
+ android:exported="true">
diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/build.gradle b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/build.gradle
index 32d885661f..d41f36c9d3 100644
--- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/build.gradle
+++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-4/build.gradle
@@ -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"
diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/AndroidManifest.xml b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/AndroidManifest.xml
index a43b75fad9..dc40a081ad 100755
--- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/AndroidManifest.xml
+++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/AndroidManifest.xml
@@ -4,10 +4,6 @@
android:versionCode="1"
android:versionName="1.0" >
-
-
@@ -18,7 +14,8 @@
android:label="@string/app_name" >
+ android:label="@string/app_name"
+ android:exported="true">
diff --git a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/build.gradle b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/build.gradle
index 10230fbb4d..7ccc56288b 100644
--- a/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/build.gradle
+++ b/subprojects/gst-docs/examples/tutorials/android/android-tutorial-5/build.gradle
@@ -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"
diff --git a/subprojects/gst-docs/examples/tutorials/android/build.gradle b/subprojects/gst-docs/examples/tutorials/android/build.gradle
index 55db43fb88..9025b5ed59 100644
--- a/subprojects/gst-docs/examples/tutorials/android/build.gradle
+++ b/subprojects/gst-docs/examples/tutorials/android/build.gradle
@@ -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
diff --git a/subprojects/gst-docs/examples/tutorials/android/gradle/wrapper/gradle-wrapper.properties b/subprojects/gst-docs/examples/tutorials/android/gradle/wrapper/gradle-wrapper.properties
index 205e07cbee..db5e4271ad 100644
--- a/subprojects/gst-docs/examples/tutorials/android/gradle/wrapper/gradle-wrapper.properties
+++ b/subprojects/gst-docs/examples/tutorials/android/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/subprojects/gst-examples/vulkan/android/AndroidManifest.xml b/subprojects/gst-examples/vulkan/android/AndroidManifest.xml
index 1441174ada..1a561456b3 100644
--- a/subprojects/gst-examples/vulkan/android/AndroidManifest.xml
+++ b/subprojects/gst-examples/vulkan/android/AndroidManifest.xml
@@ -6,7 +6,8 @@
android:required="true"/>
+ android:label="@string/app_name"
+ android:exported="true">
diff --git a/subprojects/gst-examples/vulkan/android/build.gradle b/subprojects/gst-examples/vulkan/android/build.gradle
index 6fff9e990b..494c684914 100644
--- a/subprojects/gst-examples/vulkan/android/build.gradle
+++ b/subprojects/gst-examples/vulkan/android/build.gradle
@@ -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()
-}
\ No newline at end of file
+}
diff --git a/subprojects/gst-examples/vulkan/android/gradle/wrapper/gradle-wrapper.properties b/subprojects/gst-examples/vulkan/android/gradle/wrapper/gradle-wrapper.properties
index c1bad43dd3..db5e4271ad 100644
--- a/subprojects/gst-examples/vulkan/android/gradle/wrapper/gradle-wrapper.properties
+++ b/subprojects/gst-examples/vulkan/android/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/subprojects/gst-examples/webrtc/android/app/build.gradle b/subprojects/gst-examples/webrtc/android/app/build.gradle
index 7644e1e7e3..da6a8f569e 100644
--- a/subprojects/gst-examples/webrtc/android/app/build.gradle
+++ b/subprojects/gst-examples/webrtc/android/app/build.gradle
@@ -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"
diff --git a/subprojects/gst-examples/webrtc/android/app/src/main/AndroidManifest.xml b/subprojects/gst-examples/webrtc/android/app/src/main/AndroidManifest.xml
index 54d92cf87e..b907bc643f 100644
--- a/subprojects/gst-examples/webrtc/android/app/src/main/AndroidManifest.xml
+++ b/subprojects/gst-examples/webrtc/android/app/src/main/AndroidManifest.xml
@@ -12,7 +12,8 @@
+ android:label="@string/app_name"
+ android:exported="true">
@@ -24,4 +25,4 @@
-
+
diff --git a/subprojects/gst-examples/webrtc/android/build.gradle b/subprojects/gst-examples/webrtc/android/build.gradle
index bc8d66a010..d6e851f7c0 100644
--- a/subprojects/gst-examples/webrtc/android/build.gradle
+++ b/subprojects/gst-examples/webrtc/android/build.gradle
@@ -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
-}
diff --git a/subprojects/gst-examples/webrtc/android/gradle/wrapper/gradle-wrapper.properties b/subprojects/gst-examples/webrtc/android/gradle/wrapper/gradle-wrapper.properties
index c1bad43dd3..db5e4271ad 100644
--- a/subprojects/gst-examples/webrtc/android/gradle/wrapper/gradle-wrapper.properties
+++ b/subprojects/gst-examples/webrtc/android/gradle/wrapper/gradle-wrapper.properties
@@ -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