Merge pull request #581 from TakayukiHoshi1984/modify_minsdkversion_upgrade

TakayukiHoshi1984 · web-flow · commit 5d2adc7fa47b · 2022-01-13T12:21:32.000+09:00
Androidバージョンのアップグレード
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle b/dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle
@@ -25,7 +25,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionName getVersionName()
 
diff --git a/dConnectDevicePlugin/dConnectDeviceLinking/app/build.gradle b/dConnectDevicePlugin/dConnectDeviceLinking/app/build.gradle
@@ -22,7 +22,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName getVersionName()
diff --git a/dConnectDevicePlugin/dConnectDeviceLinking/plugin/build.gradle b/dConnectDevicePlugin/dConnectDeviceLinking/plugin/build.gradle
@@ -11,7 +11,7 @@ android {
     compileSdkVersion 29
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.linking"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/dConnectDevicePlugin/dConnectDeviceTest/app/build.gradle b/dConnectDevicePlugin/dConnectDeviceTest/app/build.gradle
@@ -23,7 +23,7 @@ android {
 
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.test"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName getVersionName()
diff --git a/dConnectDevicePlugin/dConnectDeviceUVC/app/build.gradle b/dConnectDevicePlugin/dConnectDeviceUVC/app/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'com.android.library'
+apply plugin: 'com.android.application'
 
 // Create github.properties in root project folder file with
 // gpr.usr=GITHUB_USER_ID
@@ -24,8 +24,8 @@ android {
     }
 
     defaultConfig {
-//        applicationId "org.deviceconnect.android.deviceplugin.uvc"
-        minSdkVersion 21
+        applicationId "org.deviceconnect.android.deviceplugin.uvc"
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName getVersionName()
diff --git a/dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/AndroidManifest.xml
@@ -8,7 +8,12 @@
 
     <uses-feature android:name="android.hardware.usb.host" />
 
-    <application android:allowBackup="false">
+    <application
+        android:allowBackup="false"
+        android:icon="@drawable/dconnect_icon"
+        android:label="@string/app_name_uvc"
+        android:theme="@style/AppTheme">
+
 
         <!-- プラグインの設定画面用の Activity -->
         <activity android:name=".activity.UVCSettingsActivity"
diff --git a/dConnectManager/dConnectManager/dconnect-manager-app-things/build.gradle b/dConnectManager/dConnectManager/dconnect-manager-app-things/build.gradle
@@ -13,7 +13,7 @@ android {
 
     defaultConfig {
         applicationId "org.deviceconnect.android.manager"
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/dConnectManager/dConnectManager/dconnect-manager-app/build.gradle b/dConnectManager/dConnectManager/dconnect-manager-app/build.gradle
@@ -24,7 +24,7 @@ android {
 
     defaultConfig {
         applicationId "org.deviceconnect.android.manager"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName getVersionName()
diff --git a/dConnectManager/dConnectManager/dconnect-manager-core/build.gradle b/dConnectManager/dConnectManager/dconnect-manager-core/build.gradle
@@ -11,7 +11,7 @@ if (githubPropertiesFile.exists()) {
 android {
     compileSdkVersion 29
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/dConnectManager/dConnectServerNanoHttpd/nanohttpd/build.gradle b/dConnectManager/dConnectServerNanoHttpd/nanohttpd/build.gradle
@@ -16,7 +16,7 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 26
         targetSdkVersion 29
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/dConnectSDK/dConnectLibStreaming/libmedia/build.gradle b/dConnectSDK/dConnectLibStreaming/libmedia/build.gradle
@@ -19,7 +19,7 @@ android {
     compileSdkVersion 30
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName getVersionName()
diff --git a/dConnectSDK/dConnectLibStreaming/libopus/build.gradle b/dConnectSDK/dConnectLibStreaming/libopus/build.gradle
@@ -5,7 +5,7 @@ android {
     ndkVersion "21.0.6113669"
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/dConnectSDK/dConnectLibStreaming/libsrt/build.gradle b/dConnectSDK/dConnectLibStreaming/libsrt/build.gradle
@@ -18,7 +18,7 @@ android {
     ndkVersion '21.4.7075529'
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName getVersionName()
diff --git a/dConnectSDK/dConnectLibStreaming/mjpeg-server-app/build.gradle b/dConnectSDK/dConnectLibStreaming/mjpeg-server-app/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "org.deviceconnect.android.mjpeg_server_app"
-        minSdkVersion 23
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/dConnectSDK/dConnectLibStreaming/rtmp-broadcast-app/build.gradle b/dConnectSDK/dConnectLibStreaming/rtmp-broadcast-app/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "org.deviceconnect.android.rtmp_broadcast_app"
-        minSdkVersion 23
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/build.gradle b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/build.gradle
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         applicationId "org.deviceconnect.android.rtspplayer"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0.0"
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-server-app/build.gradle b/dConnectSDK/dConnectLibStreaming/rtsp-server-app/build.gradle
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         applicationId "org.deviceconnect.android.rtspserver"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0.0"
diff --git a/dConnectSDK/dConnectLibStreaming/srt-broadcast-app/build.gradle b/dConnectSDK/dConnectLibStreaming/srt-broadcast-app/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "org.deviceconnect.android.srt_broadcast_app"
-        minSdkVersion 23
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
diff --git a/dConnectSDK/dConnectLibStreaming/srt-player-app/build.gradle b/dConnectSDK/dConnectLibStreaming/srt-player-app/build.gradle
@@ -13,7 +13,7 @@ android {
 
     defaultConfig {
         applicationId "org.deviceconnect.android.srt_player_app"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.0.0"
diff --git a/dConnectSDK/dConnectLibStreaming/srt-server-app/build.gradle b/dConnectSDK/dConnectLibStreaming/srt-server-app/build.gradle
@@ -13,7 +13,7 @@ android {
 
     defaultConfig {
         applicationId "org.deviceconnect.android.srt_server_app"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         versionName "1.1.1"

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ android {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`defaultConfig {`
`28`		`- minSdkVersion 21`
	`28`	`+ minSdkVersion 26`
`29`	`29`	`targetSdkVersion 29`
`30`	`30`	`versionName getVersionName()`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ android {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`defaultConfig {`
`25`		`- minSdkVersion 21`
	`25`	`+ minSdkVersion 26`
`26`	`26`	`targetSdkVersion 29`
`27`	`27`	`versionCode 1`
`28`	`28`	`versionName getVersionName()`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ android {`
`16`	`16`	`compileSdkVersion 29`
`17`	`17`
`18`	`18`	`defaultConfig {`
`19`		`- minSdkVersion 14`
	`19`	`+ minSdkVersion 26`
`20`	`20`	`targetSdkVersion 29`
`21`	`21`	`testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`22`	`22`	`}`