Merge pull request #3 from TakayukiHoshi1984/modify_android_for_kotlin_template

Kotlinのテンプレートを追加

Author: TakayukiHoshi1984

assembly.xml

@@ -2,7 +2,7 @@
 <assembly>
     <id>dist</id>
     <formats>
-    	<format>zip</format>
+        <format>zip</format>
     </formats>
     <fileSets>
         <fileSet>
@@ -14,11 +14,13 @@
                 <include>RELEASENOTE.TXT</include>
             </includes>
         </fileSet>
-    	<fileSet>
+        <fileSet>
             <directory>samples</directory>
             <outputDirectory>samples</outputDirectory>
-    		<includes>
-    			<include>android-plugin.sh</include>
+            <includes>
+               <include>android-plugin-kotlin.sh</include>
+                <include>android-plugin-kotlin.bat</include>
+                <include>android-plugin.sh</include>
                 <include>android-plugin.bat</include>
                 <include>ios-plugin.sh</include>
                 <include>ios-plugin.bat</include>
@@ -30,9 +32,16 @@
                 <include>emulator.bat</include>
                 <include>html-docs.sh</include>
                 <include>html-docs.bat</include>
-    		</includes>
+            </includes>
             <fileMode>0744</fileMode>
-    	</fileSet>
+        </fileSet>
+        <fileSet>
+            <directory>modules/deviceconnect-codegen/src/main/resources</directory>
+            <outputDirectory>samples/templates</outputDirectory>
+            <includes>
+                <include>deviceConnect*/**</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>samples/sample-profile-specs</directory>
             <outputDirectory>samples/sample-profile-specs</outputDirectory>
@@ -41,6 +50,13 @@
                 <include>*.yaml</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>samples/configs</directory>
+            <outputDirectory>samples/configs</outputDirectory>
+            <includes>
+                <include>*.json</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>samples/sample-profile-specs/swagger-files</directory>
             <outputDirectory>samples/sample-profile-specs/swagger-files</outputDirectory>

modules/deviceconnect-codegen/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.deviceconnect</groupId>
     <artifactId>deviceconnect-codegen</artifactId>
-    <version>1.9.1</version>
+    <version>1.9.2</version>
 
     <packaging>jar</packaging>