Android 向けプラグインのテンプレートに変数を追加。

Author: masaru-takano

modules/deviceconnect-codegen/src/main/java/org/deviceconnect/codegen/plugin/AndroidPluginCodegenConfig.java

@@ -41,6 +41,20 @@ public enum ConnectionType {
     private final String apiDocPath = "docs/";
     private final String modelDocPath = "docs/";
 
+    {
+        addOption("targetSdkVersion", "", "28");
+        addOption("minSdkVersion", "", "19");
+        addOption("compileSdkVersion", "", "28");
+        addOption("deviceConnectPluginSdkVersion", "", "2.7.2");
+        addOption("deviceConnectSdkForAndroidVersion", "", "2.3.1");
+    }
+
+    private void addOption(final String name, final String description, final String defaultValue) {
+        CliOption option = CliOption.newString(name, description);
+        option.setDefault(defaultValue);
+        this.cliOptions.add(option);
+    }
+
     @Override
     public ValidationResultSet validateOptions(final CommandLine cmd, final ClientOpts clientOpts) {
         ValidationResultSet resultSet = new ValidationResultSet();

samples/android-plugin.sh

@@ -21,6 +21,6 @@ DISPLAY_NAME="MyPlugin"
 # スケルトンコード生成ツールのバイナリ
 JAR_FILE="../bin/deviceconnect-codegen.jar"
 
-ARGS="--input-spec $SPEC  --lang deviceConnectAndroidPlugin --template-dir $TEMPLATE_DIR --package-name $PACKAGE_NAME  --connection-type $CONNECTION_TYPE  --display-name $DISPLAY_NAME  --output $OUTPUT_DIR"
+ARGS="--input-spec $SPEC  --lang deviceConnectAndroidPlugin --config configs/android-plugin.json --template-dir $TEMPLATE_DIR --package-name $PACKAGE_NAME  --connection-type $CONNECTION_TYPE  --display-name $DISPLAY_NAME  --output $OUTPUT_DIR"
 
 java -Dfile.encoding=UTF-8 -jar $JAR_FILE $ARGS

samples/configs/android-plugin.json

@@ -0,0 +1,6 @@
+{
+  "compileSdkVersion": "28",
+  "minSdkVersion": "19",
+  "targetSdkVersion": "28",
+  "deviceConnectPluginSdkVersion": "2.7.2"
+}

samples/templates/deviceConnectAndroidPlugin/gradleFiles/2_x_x/plugin.build.gradle.mustache

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 dependencies {
     compile fileTree(include: '*.jar', dir: 'libs')
-    compile 'org.deviceconnect:dconnect-device-plugin-sdk:2.3.0'
+    compile 'org.deviceconnect:dconnect-device-plugin-sdk:{{{deviceConnectPluginSdkVersion}}}'
 }
 
 repositories {
@@ -12,13 +12,13 @@ repositories {
 
 android {
 
-    compileSdkVersion 23
+    compileSdkVersion {{compileSdkVersion}}
     buildToolsVersion '25.0.2'
 
     defaultConfig {
         applicationId "{{invokerPackage}}"
-        minSdkVersion 14
-        targetSdkVersion 23
+        minSdkVersion {{minSdkVersion}}
+        targetSdkVersion {{targetSdkVersion}}
         versionCode 1
         versionName '1.0.0'
     }

samples/templates/deviceConnectAndroidPlugin/gradleFiles/3_x_x/plugin.build.gradle.mustache

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.3.0'
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:{{{deviceConnectPluginSdkVersion}}}'
 }
 
 repositories {
@@ -12,13 +12,12 @@ repositories {
 
 android {
 
-    compileSdkVersion 23
-    buildToolsVersion '26.0.2'
+    compileSdkVersion {{compileSdkVersion}}
 
     defaultConfig {
         applicationId "{{invokerPackage}}"
-        minSdkVersion 14
-        targetSdkVersion 23
+        minSdkVersion {{minSdkVersion}}
+        targetSdkVersion {{targetSdkVersion}}
         versionCode 1
         versionName '1.0.0'
     }