Gradleのアップデート。

Author: TakayukiHoshi1984

dConnectManager/dConnectManager/build.gradle

@@ -3,10 +3,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,6 +17,6 @@ allprojects {
     repositories {
         maven { url 'https://jitpack.io' }
         google()
-        jcenter()
+        mavenCentral()
     }
 }

dConnectManager/dConnectManager/dconnect-manager-app/build.gradle

@@ -116,7 +116,7 @@ dependencies {
 }
 
 android.testVariants.all { variant ->
-    task("generateJavadocForManagerJUnit", type: Javadoc, overwrite: true) {
+    tasks.register("generate${variant.name.capitalize()}JavadocForManagerJUnit", Javadoc) {
         title = "Android Device Connect Manager Unit Test"
         description = "Generates Javadoc for JUnit"
         source = android.sourceSets.androidTest.java.sourceFiles

dConnectManager/dConnectManager/dconnect-manager-app/src/main/java/org/deviceconnect/android/manager/DConnectService.java

@@ -308,36 +308,36 @@ public void onError(final Exception e) {
     /**
      * Hostプラグインを追加します.
      */
-    private void addDevicePlugin() {
-        String packageName = getPackageName();
-        String className = HostDevicePlugin.class.getName();
-
-        DevicePlugin plugin;
-        try {
-            plugin = new DevicePlugin.Builder(this)
-                    .setClassName(className)
-                    .setPackageName(packageName)
-                    .setConnectionType(ConnectionType.DIRECT)
-                    .setDeviceName(getString(R.string.app_name_host))
-                    .setPluginIconId(R.drawable.dconnect_icon)
-                    .setVersionName(org.deviceconnect.android.deviceplugin.host.BuildConfig.VERSION_NAME)
-                    .setPluginXml(DevicePluginXmlUtil.getXml(getApplicationContext(),
-                            R.xml.org_deviceconnect_android_deviceplugin_host))
-                    .setPluginId(DConnectUtil.toMD5(packageName + className))
-                    .setPluginSdkVersionName(VersionName.parse("2.0.0"))
-                    .addProviderAuthority("org.deviceconnect.android.deviceplugin.host.provider.included")
-                    .build();
-            mManager.getPluginManager().addDevicePlugin(plugin);
-        } catch (UnsupportedEncodingException e) {
-            if (DEBUG) {
-                Log.e(TAG, "add plugin error.", e);
-            }
-        } catch (NoSuchAlgorithmException e) {
-            if (DEBUG) {
-                Log.e(TAG, "add plugin error.", e);
-            }
-        }
-    }
+//    private void addDevicePlugin() {
+//        String packageName = getPackageName();
+//        String className = HostDevicePlugin.class.getName();
+//
+//        DevicePlugin plugin;
+//        try {
+//            plugin = new DevicePlugin.Builder(this)
+//                    .setClassName(className)
+//                    .setPackageName(packageName)
+//                    .setConnectionType(ConnectionType.DIRECT)
+//                    .setDeviceName(getString(R.string.app_name_host))
+//                    .setPluginIconId(R.drawable.dconnect_icon)
+//                    .setVersionName(org.deviceconnect.android.deviceplugin.host.BuildConfig.VERSION_NAME)
+//                    .setPluginXml(DevicePluginXmlUtil.getXml(getApplicationContext(),
+//                            R.xml.org_deviceconnect_android_deviceplugin_host))
+//                    .setPluginId(DConnectUtil.toMD5(packageName + className))
+//                    .setPluginSdkVersionName(VersionName.parse("2.0.0"))
+//                    .addProviderAuthority("org.deviceconnect.android.deviceplugin.host.provider.included")
+//                    .build();
+//            mManager.getPluginManager().addDevicePlugin(plugin);
+//        } catch (UnsupportedEncodingException e) {
+//            if (DEBUG) {
+//                Log.e(TAG, "add plugin error.", e);
+//            }
+//        } catch (NoSuchAlgorithmException e) {
+//            if (DEBUG) {
+//                Log.e(TAG, "add plugin error.", e);
+//            }
+//        }
+//    }
     /**
      * DConnectManagerを停止します.
      */

dConnectManager/dConnectManager/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Apr 20 11:14:05 JST 2020
+#Tue Jul 13 12:04:58 JST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+zipStoreBase=GRADLE_USER_HOME

dConnectSDK/dConnectLibStreaming/libsrt/build.gradle

@@ -15,7 +15,7 @@ def getArtificatId = { ->
 
 android {
     compileSdkVersion 29
-    ndkVersion "21.0.6113669"
+    ndkVersion '21.4.7075529'
 
     defaultConfig {
         minSdkVersion 21