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

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1622>

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 cc6f8f4..c9ae093 100644 (file)
--- 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">
-    <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" />

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 1b38d3c..7bdb45a 100644 (file)
--- 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 cddedbf..a61a89c 100644 (file)
--- 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">
-    <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" />

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 e2caed9..47bfa1a 100644 (file)
--- 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 1ac1cba..0251867 100644 (file)
--- 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">
-    <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" />

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 e959dd1..239d8f4 100644 (file)
--- 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 aa06aab..b5c2800 100644 (file)
--- 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">
-    <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" />

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 32d8856..d41f36c 100644 (file)
--- 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 a43b75f..dc40a08 100755 (executable)
--- 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" >
 
-    <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" />

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 10230fb..7ccc562 100644 (file)
--- 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 55db43f..9025b5e 100644 (file)
--- 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 205e07c..db5e427 100644 (file)
--- 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 1441174..1a56145 100644 (file)
--- a/subprojects/gst-examples/vulkan/android/AndroidManifest.xml
+++ b/subprojects/gst-examples/vulkan/android/AndroidManifest.xml
@@ -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" />

diff --git a/subprojects/gst-examples/vulkan/android/build.gradle b/subprojects/gst-examples/vulkan/android/build.gradle
index 6fff9e9..494c684 100644 (file)
--- 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 c1bad43..db5e427 100644 (file)
--- 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 7644e1e..da6a8f5 100644 (file)
--- 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 54d92cf..b907bc6 100644 (file)
--- 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 @@
 
     <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>

diff --git a/subprojects/gst-examples/webrtc/android/build.gradle b/subprojects/gst-examples/webrtc/android/build.gradle
index bc8d66a..d6e851f 100644 (file)
--- 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 c1bad43..db5e427 100644 (file)
--- 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