Merge pull request #2 from TakayukiHoshi1984/modify_aar_github_packages

Codegenから生成したプラグインがaarをGitHub Packagesからダウンロードする様に修正

Author: TakayukiHoshi1984

.idea/misc.xml

@@ -33,7 +33,7 @@ DeviceConnect Codegenは、DeviceConnectシステム上で動作するプラグ
 |samples/profiles-specs|シェルスクリプトのサンプルに入力するプロファイル定義ファイル群。|
 
 ## Get Started
-[deviceconnect-codegen-project-1.9.0-dist.zip](https://github.com/TakayukiHoshi1984/DeviceConnect-Experiments/releases/tag/codegen-v1.9.0) をPC上の任意の場所にダウンロードし、解凍してください。
+[deviceconnect-codegen-project-1.9.1-dist.zip](https://github.com/DeviceConnect/DeviceConnect-Codegen/releases/tag/codegen-v1.9.1) をPC上の任意の場所にダウンロードし、解凍してください。
 
 解凍後、ターミナルを起動し、以下のコマンドによりをサンプルのスケルトンコードを生成してください。
 

MANUAL.md

@@ -1,5 +1,9 @@
 # DeviceConnect Codegen
 
+## はじめに
+DeviceConnect Codegenは、DeviceConnectシステム上で動作するプラグインおよびアプリケーションのスケルトンコードを生成するためのコマンドラインツールです。
+
+
 ## 開発環境
 ### 開発ツール
 - Apache Maven 3.3.9+
@@ -25,18 +29,21 @@ $ mvn package
 例: バージョン a.b.c に変更する場合
 
 ```
-$ cd DeviceConnect-Experiments/DeviceConnectCodegen
+$ cd DeviceConnect-Codegen
 $ python tools/version.py a.b.c
 ```
 
 正常に変更された場合は、以下のログが標準出力される。
 
 ```
-Changed: /(略)/DeviceConnect-Experiments/DeviceConnectCodegen/pom.xml
-Changed: /(略)/DeviceConnect-Experiments/DeviceConnectCodegen/modules/deviceconnect-codegen/pom.xml
-Changed: /(略)/DeviceConnect-Experiments/DeviceConnectCodegen/README.md
+Changed: /(略)/DeviceConnect-Codegen/pom.xml
+Changed: /(略)/DeviceConnect-Codegen/modules/deviceconnect-codegen/pom.xml
+Changed: /(略)/DeviceConnect-Codegen/README.md
 Completed
 ```
 
+## 使用方法
+作成したツールを使い、スケルトンコードを作成する手順は、[こちら](https://github.com/DeviceConnect/DeviceConnect-Codegen/blob/master/MANUAL.md)を参照してください。
+
 ## 参考リンク
-- [Swagger](http://swagger.io/)
+- [Swagger](http://swagger.io/)

README.md

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

deviceconnect-codegen-project.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

modules/deviceconnect-codegen/deviceconnect-codegen.iml

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

modules/deviceconnect-codegen/pom.xml

@@ -30,7 +30,7 @@ public enum ConnectionType {
         BROADCAST,
         BINDER
     }
-
+    private static final String DEVICE_PLUGIN_SDK_VERSION_NAME = "2.8.4";
     private final String pluginModuleFolder = "plugin";
     private final String projectFolder = pluginModuleFolder + "/src/main";
     private final String sourceFolder = projectFolder + "/java";
@@ -42,17 +42,20 @@ public enum ConnectionType {
     private final String modelDocPath = "docs/";
 
     {
-        putOption("targetSdkVersion", "", "28");
+        putOption("targetSdkVersion", "", "29");
         putOption("minSdkVersion", "", "19");
-        putOption("compileSdkVersion", "", "28");
-        putOption("deviceConnectPluginSdkVersion", "", "2.7.2");
-        putOption("deviceConnectSdkForAndroidVersion", "", "2.3.1");
+        putOption("compileSdkVersion", "", "29");
+        putOption("deviceConnectPluginSdkVersion", "", DEVICE_PLUGIN_SDK_VERSION_NAME);
+        putOption("deviceConnectSdkForAndroidVersion", "", "2.3.2");
+        putOption("githubAccountName", "", "YOUR_NAME");
+        putOption("githubAccountKey", "", "YOUR_KEY");
     }
 
     private void putOption(final String name, final String description, final String defaultValue) {
         CliOption option = CliOption.newString(name, description);
         option.setDefault(defaultValue);
         this.cliOptions.add(option);
+        this.additionalProperties.put(name, defaultValue);
     }
 
     @Override
@@ -277,7 +280,12 @@ public void processOpts() {
         String manifest = getManifestTemplateFile();
         supportingFiles.add(new SupportingFile("manifest/" + manifest, getProjectDir(), "AndroidManifest.xml"));
         supportingFiles.add(new SupportingFile(getGradleTemplateDir()+ "/root.build.gradle.mustache", "", "build.gradle"));
-        supportingFiles.add(new SupportingFile(getGradleTemplateDir() + "/plugin.build.gradle.mustache", getPluginModuleDir(), "build.gradle"));
+        if (getGradleTemplateFile().indexOf(DEVICE_PLUGIN_SDK_VERSION_NAME) != -1) {
+            supportingFiles.add(new SupportingFile("github.properties.mustache", "", "github.properties"));
+            supportingFiles.add(new SupportingFile(getGradleTemplateDir() + "/plugin.2.8.4.build.gradle.mustache", getPluginModuleDir(), "build.gradle"));
+        } else{
+            supportingFiles.add(new SupportingFile(getGradleTemplateDir() + "/plugin.build.gradle.mustache", getPluginModuleDir(), "build.gradle"));
+        }
         supportingFiles.add(new SupportingFile("gradle.properties.mustache", "", "gradle.properties"));
         supportingFiles.add(new SupportingFile("resource/xml/deviceplugin.xml.mustache", getPluginResourceDir() + "/xml", getDevicePluginXmlName() + ".xml"));
         supportingFiles.add(new SupportingFile("resource/values/strings.xml.mustache", getPluginResourceDir() + "/values", "strings.xml"));
@@ -316,6 +324,22 @@ protected String getManifestTemplateFile() {
         return manifest;
     }
 
+    protected String getGradleTemplateFile() {
+        String gradleVersion;
+        final VersionName ver2_8_4 = VersionName.parse(DEVICE_PLUGIN_SDK_VERSION_NAME);
+        String versionParam = (String) additionalProperties.get("deviceConnectPluginSdkVersion");
+        VersionName version = VersionName.parse(versionParam);
+        if (version == null) {
+            version = ver2_8_4;
+        }
+        if (version.isEqualOrMoreThan(ver2_8_4)) {
+            gradleVersion = DEVICE_PLUGIN_SDK_VERSION_NAME + ".";
+        } else {
+            gradleVersion = "";
+        }
+        return gradleVersion;
+    }
+
     protected String getPluginSourceDir() {
         return sourceFolder;
     }

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

@@ -18,7 +18,7 @@ Android Studio 2.2.1以上
 
 
 ## 関連ページ
-- [Device Connect プラグイン開発マニュアル](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/DevicePlugin-Manual-for-Android-Studio-110)
+- [Device Connect プラグイン開発マニュアル](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/Plugin-Development-Manual-for-Plugin-SDK-ver-2.4.0)
 
 ## テスト
 以下は config オプションのテストです。
@@ -28,4 +28,4 @@ testInt: {{testInt}}
 testNumber: {{testNumber}}
 testBoolean: {{testBoolean}}
 testObject: {{#testObject}}{{objKey}}{{/testObject}}
-testArray: {{#testArray}}{{.}} {{/testArray}}
+testArray: {{#testArray}}{{.}} {{/testArray}}

modules/deviceconnect-codegen/src/main/resources/deviceConnectAndroidPlugin/README.md.mustache

@@ -0,0 +1,2 @@
+gpr.usr={{githubAccountName}}
+gpr.key={{githubAccountKey}}

modules/deviceconnect-codegen/src/main/resources/deviceConnectAndroidPlugin/github.properties.mustache

@@ -0,0 +1,72 @@
+apply plugin: 'com.android.application'
+
+// Create github.properties in root project folder file with
+// gpr.usr=GITHUB_USER_ID
+// gpr.key=PERSONAL_ACCESS_TOKEN
+def githubPropertiesFile = rootProject.file("github.properties")
+def githubProperties = new Properties()
+if (githubPropertiesFile.exists()) {
+    githubProperties.load(new FileInputStream(githubPropertiesFile))
+}
+
+dependencies {
+    implementation fileTree(include: '*.jar', dir: 'libs')
+    implementation 'org.deviceconnect:dconnect-device-plugin-sdk:{{{deviceConnectPluginSdkVersion}}}'
+}
+
+android {
+
+    compileSdkVersion {{compileSdkVersion}}
+
+    defaultConfig {
+        applicationId "{{invokerPackage}}"
+        minSdkVersion {{minSdkVersion}}
+        targetSdkVersion {{targetSdkVersion}}
+        versionCode 1
+        versionName '1.0.0'
+    }
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
+    signingConfigs {
+        releaseConfig {
+            storeFile=file(project.properties.storeFile)
+            storePassword=project.properties.storePassword
+            keyAlias=project.properties.keyAlias
+            keyPassword=project.properties.keyPassword
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            signingConfig signingConfigs.releaseConfig
+        }
+    }
+
+    packagingOptions {
+        exclude 'LICENSE.txt'
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+    }
+
+    tasks.withType(JavaCompile) {
+        options.encoding = 'UTF-8'
+    }
+    repositories {
+        maven {
+            name = "DeviceConnect-Android"
+            url = uri("https://maven.pkg.github.com/DeviceConnect/DeviceConnect-Android")
+
+            credentials {
+                username = System.getenv("GPR_USER") ?: githubProperties['gpr.usr']
+                password = System.getenv("GPR_API_KEY") ?: githubProperties['gpr.key']
+            }
+        }
+    }
+}