Android10のScopedStorageにあわせた修正

.gitignore

@@ -5,6 +5,7 @@
 *.apk
 *.ap_
 .externalNativeBuild
+.cxx/
 
 # Files for the Dalvik VM
 *.dex
@@ -108,7 +109,7 @@ local.properties
 # PDT-specific
 .buildpath
 
-# sbteclipse plugin 
+# sbteclipse plugin
 .target
 
 # TeXlipse plugin
@@ -301,4 +302,4 @@ DerivedData
 ant.properties
 build.xml
 HVCW.jar
-RobotLibrary.jar
+RobotLibrary.jar

README.md

@@ -31,10 +31,10 @@ DeviceConnect-Androidのソースコードをダウンロードしてくださ
 $ git clone https://github.com/DeviceConnect/DeviceConnect-Android.git
 ```
 
-ビルド前にANDROID_HOMEの環境変数にAndroidSDKへのパスが設定されていることを確認してください。
+ビルド前にANDROID_SDK_ROOTの環境変数にAndroidSDKへのパスが設定されていることを確認してください。
 
 ```
-$ echo 'export ANDROID_HOME=<path>' >> ~/.bash_profile
+$ echo 'export ANDROID_SDK_ROOT=<path>' >> ~/.bash_profile
 ```
 
 &lt;path&gt;には、AndroidSDKへのパスを指定してください。
@@ -49,7 +49,7 @@ $ ./gradlew assembleDebug
 Device Connect Managerを端末にインストールします。
 
 ```
-$ adb install app/build/outputs/apk/app-debug.apk
+$ adb install dconnect-manager-app/build/outputs/apk/debug/dconnect-manager-app-debug.apk
 ```
 
 ### Windows

dConnectDevicePlugin/dConnectDeviceAndroidWear/app/build.gradle

@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.5.2'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.0'
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'com.google.android.gms:play-services-wearable:15.0.1'
 
@@ -17,7 +17,7 @@ dependencies {
 
 android {
 
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     def getVersionName = { ->
         def version
@@ -33,7 +33,7 @@ android {
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.wear"
         minSdkVersion 23
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName getVersionName()
         multiDexEnabled true
@@ -69,4 +69,8 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }

dConnectDevicePlugin/dConnectDeviceAndroidWear/wear-app/build.gradle

@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
 
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.wear"
         minSdkVersion 23
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName '2.0.0'
     }
@@ -34,7 +34,10 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
-
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

dConnectDevicePlugin/dConnectDeviceChromeCast/app/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
 
     def getVersionName = { ->
         def version
@@ -17,7 +17,7 @@ android {
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.chromecast"
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName getVersionName()
     }
@@ -48,6 +48,10 @@ android {
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 repositories {
@@ -59,9 +63,9 @@ repositories {
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.5.1'
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:mediarouter-v7:26.1.0'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:mediarouter-v7:28.0.0'
     implementation 'com.google.android.gms:play-services-cast-framework:11.8.0'
 }
 

dConnectDevicePlugin/dConnectDeviceFaBo/app/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 29
 
     def getVersionName = { ->
         def version
@@ -16,7 +16,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         versionName getVersionName()
     }
@@ -41,6 +41,10 @@ android {
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 repositories {
@@ -52,7 +56,7 @@ repositories {
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    api 'org.deviceconnect:dconnect-device-plugin-sdk:2.5.2'
+    api 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.0'
     androidTestImplementation 'com.android.support.test:testing-support-lib:0.1'
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
 }

dConnectDevicePlugin/dConnectDeviceFaBo/app/src/main/java/org/deviceconnect/android/deviceplugin/fabo/FaBoDeviceService.java

@@ -27,7 +27,8 @@
 import org.deviceconnect.android.message.DConnectMessageService;
 import org.deviceconnect.android.profile.DConnectProfile;
 import org.deviceconnect.android.profile.SystemProfile;
-import org.deviceconnect.android.profile.spec.DConnectProfileSpec;
+import org.deviceconnect.android.profile.spec.DConnectServiceSpec;
+import org.deviceconnect.android.profile.spec.models.Swagger;
 import org.deviceconnect.android.service.DConnectService;
 
 import java.util.ArrayList;
@@ -269,12 +270,6 @@ public VirtualService updateServiceData(final ServiceData serviceData) {
                     DConnectProfile profile = VirtualServiceFactory.createProfile(p);
                     if (profile != null) {
                         service.addProfile(profile);
-
-                        DConnectProfileSpec profileSpec =
-                                getPluginSpec().findProfileSpec(profile.getProfileName().toLowerCase());
-                        if (profileSpec != null) {
-                            profile.setProfileSpec(profileSpec);
-                        }
                         profile.setContext(this);
                     }
                 }

dConnectDevicePlugin/dConnectDeviceFaBo/plugin/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 29
 
     def getVersionName = { ->
         def version
@@ -17,7 +17,7 @@ android {
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.fabo"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         versionName getVersionName()
 
@@ -44,6 +44,10 @@ android {
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 repositories {

dConnectDevicePlugin/dConnectDeviceFaBo/things-plugin/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 29
 
     def getVersionName = { ->
         def version
@@ -17,7 +17,7 @@ android {
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.fabo"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         versionName getVersionName()
 
@@ -44,6 +44,10 @@ android {
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 repositories {
     maven { url 'https://raw.githubusercontent.com/DeviceConnect/DeviceConnect-Android/master/dConnectSDK/dConnectSDKForAndroid/repository/' }
@@ -55,5 +59,5 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':app')
-    compileOnly 'com.google.android.things:androidthings:0.4-devpreview'
+    compileOnly 'com.google.android.things:androidthings:1.0'
 }

dConnectDevicePlugin/dConnectDeviceFaBo/things-plugin/src/main/java/org/deviceconnect/android/deviceplugin/fabo/device/things/FaBoThingsDeviceControl.java

@@ -7,7 +7,7 @@
 import com.google.android.things.pio.Gpio;
 import com.google.android.things.pio.GpioCallback;
 import com.google.android.things.pio.I2cDevice;
-import com.google.android.things.pio.PeripheralManagerService;
+import com.google.android.things.pio.PeripheralManager;
 
 import org.deviceconnect.android.deviceplugin.fabo.BuildConfig;
 import org.deviceconnect.android.deviceplugin.fabo.device.FaBoDeviceControl;
@@ -113,7 +113,7 @@ public class FaBoThingsDeviceControl implements FaBoDeviceControl {
     /**
      * GPIO,I2cなどのデバイスを管理するクラス.
      */
-    private PeripheralManagerService mManagerService;
+    private PeripheralManager mManagerService;
 
     /**
      * GPIOの処理を行うハンドラ.
@@ -132,7 +132,7 @@ public void initialize() {
             Log.i(TAG, "FaBoThingsDeviceControl::initialize");
         }
 
-        mManagerService = new PeripheralManagerService();
+        mManagerService = PeripheralManager.getInstance();
 
         initGpio();
     }

dConnectDevicePlugin/dConnectDeviceHOGP/plugin/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.5.1'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.0'
 }
 
 repositories {
@@ -14,12 +14,12 @@ repositories {
 
 android {
 
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.hogp"
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName '1.0.0'
     }
@@ -51,4 +51,9 @@ android {
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
 }

dConnectDevicePlugin/dConnectDeviceHVC/app/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     def getVersionName = { ->
@@ -22,7 +22,7 @@ android {
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.hvc"
         minSdkVersion 18
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName getVersionName()
     }
@@ -64,5 +64,5 @@ repositories {
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.5.1'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.0'
 }

dConnectDevicePlugin/dConnectDeviceHVC/app/src/main/java/org/deviceconnect/android/deviceplugin/hvc/HvcDeviceService.java

@@ -589,7 +589,7 @@ public void timeoutProc() {
      */
     private void initDetector() {
         if (mDetector == null) {
-            mDetector = new BleDeviceDetector(getContext());
+            mDetector = new BleDeviceDetector(this);
             mDetector.setListener(new BleDeviceDiscoveryListener() {
 
                 @Override