dConnectDemoLib でデモアプリのzipを展開できない問題を修正し、SwitchBot プラグインへ反映。

Author: masaru-takano

dConnectDevicePlugin/dConnectDeviceSwitchBot/plugin/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'org.deviceconnect:dconnect-demo-lib:1.0.0'
+    implementation 'org.deviceconnect:dconnect-demo-lib:1.0.1'
 }
 
 repositories {
@@ -21,6 +21,9 @@ repositories {
     maven {
         url 'https://raw.githubusercontent.com/DeviceConnect/DeviceConnect-Android/master/dConnectSDK/dConnectDemoLib/repository/'
     }
+    maven {
+        url 'file://' + rootDir + '/../../dConnectSDK/dConnectDemoLib/repository/'
+    }
 }
 
 android {

dConnectSDK/dConnectDemoLib/dconnect-demo-lib/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.0"
+        versionName "1.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

dConnectSDK/dConnectDemoLib/dconnect-demo-lib/src/main/java/org/deviceconnect/android/deviceplugin/demo/FileTask.java

@@ -72,6 +72,11 @@ protected void onFileError(final IOException e) {}
     protected void onUnexpectedError(final Throwable e) {}
 
     static void unzip(final InputStream src, final File destDir) throws IOException {
+        if (!destDir.exists()) {
+            if (!destDir.mkdirs()) {
+                throw new IOException("Failed to create new directory: " + destDir.getAbsolutePath());
+            }
+        }
         try (ZipInputStream in = new ZipInputStream(src)) {
             ZipEntry entry;
             while ((entry = in.getNextEntry()) != null) {

dConnectSDK/dConnectDemoLib/repository/org/deviceconnect/dconnect-demo-lib/1.0.1/dconnect-demo-lib-1.0.1.aar

@@ -0,0 +1 @@
+818b668c29882d459c07c1e3beec008d

dConnectSDK/dConnectDemoLib/repository/org/deviceconnect/dconnect-demo-lib/1.0.1/dconnect-demo-lib-1.0.1.aar.md5

@@ -0,0 +1 @@
+388ae150d65e127507219be981f12ae730571137

dConnectSDK/dConnectDemoLib/repository/org/deviceconnect/dconnect-demo-lib/1.0.1/dconnect-demo-lib-1.0.1.aar.sha1

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.deviceconnect</groupId>
+  <artifactId>dconnect-demo-lib</artifactId>
+  <version>1.0.1</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.annotation</groupId>
+      <artifactId>annotation</artifactId>
+      <version>1.1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>androidx.core</groupId>
+      <artifactId>core</artifactId>
+      <version>1.1.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>androidx.fragment</groupId>
+      <artifactId>fragment</artifactId>
+      <version>1.1.0</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

dConnectSDK/dConnectDemoLib/repository/org/deviceconnect/dconnect-demo-lib/1.0.1/dconnect-demo-lib-1.0.1.pom

@@ -0,0 +1 @@
+5f0e0e8fedf00b4bc63f2d110acfc4d5

dConnectSDK/dConnectDemoLib/repository/org/deviceconnect/dconnect-demo-lib/1.0.1/dconnect-demo-lib-1.0.1.pom.md5

@@ -0,0 +1 @@
+183a1793b3eddc4e034699d4cb2e3a1fe16cbfce

dConnectSDK/dConnectDemoLib/repository/org/deviceconnect/dconnect-demo-lib/1.0.1/dconnect-demo-lib-1.0.1.pom.sha1

@@ -3,11 +3,12 @@
   <groupId>org.deviceconnect</groupId>
   <artifactId>dconnect-demo-lib</artifactId>
   <versioning>
-    <release>1.0.0</release>
+    <release>1.0.1</release>
     <versions>
       <version>0.9.0</version>
       <version>1.0.0</version>
+      <version>1.0.1</version>
     </versions>
-    <lastUpdated>20200203035545</lastUpdated>
+    <lastUpdated>20200205045758</lastUpdated>
   </versioning>
 </metadata>