Merge pull request #20 from DylanCaiCoding/master

修复使用 kotlin 模板时不会自动创建 Dagger**Component 的问题
JessYanCoding · Sep 10, 2019 · 2490af5 · 2490af5
2 parents d5103f1 90ca32a
commit 2490af5
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 1 deletion.
diff --git a/MVPArmsTemplate/dagger2.gradle.ftl b/MVPArmsTemplate/dagger2.gradle.ftl
@@ -0,0 1,3 @@
 dependencies {
  kapt rootProject.ext.dependencies["dagger2-compiler"]
 }
diff --git a/MVPArmsTemplate/dagger2_macros.ftl b/MVPArmsTemplate/dagger2_macros.ftl
@@ -0,0 1,7 @@
 <#macro addAllKaptDependencies>
  <#if !isNewProject && ((language!'Java')?string == 'Kotlin')>
  <apply plugin="kotlin-kapt" />
  <merge from="root://activities/MVPArmsTemplate/dagger2.gradle.ftl"
  to="${escapeXmlAttribute(projectOut)}/build.gradle" />
  </#if>
 </#macro>
diff --git a/MVPArmsTemplate/recipe.xml.ftl b/MVPArmsTemplate/recipe.xml.ftl
@@ -1,7 1,9 @@
 <?xml version="1.0"?>
 <#import "root://activities/common/kotlin_macros.ftl" as kt>
 <#import "root://activities/MVPArmsTemplate/dagger2_macros.ftl" as dagger2>
 <recipe>
 <@kt.addAllKotlinDependencies />
 <@dagger2.addAllKaptDependencies />
 <#if needActivity>
  <merge from="root/AndroidManifest.xml.ftl"
  to="${escapeXmlAttribute(manifestOut)}/AndroidManifest.xml" />

diff --git a/MVPArtTemplate/dagger2.gradle.ftl b/MVPArtTemplate/dagger2.gradle.ftl
@@ -0,0 1,3 @@
 dependencies {
  kapt rootProject.ext.dependencies["dagger2-compiler"]
 }
diff --git a/MVPArtTemplate/dagger2_macros.ftl b/MVPArtTemplate/dagger2_macros.ftl
@@ -0,0 1,7 @@
 <#macro addAllKaptDependencies>
  <#if !isNewProject && ((language!'Java')?string == 'Kotlin')>
  <apply plugin="kotlin-kapt" />
  <merge from="root://activities/MVPArmsTemplate/dagger2.gradle.ftl"
  to="${escapeXmlAttribute(projectOut)}/build.gradle" />
  </#if>
 </#macro>
diff --git a/MVPArtTemplate/recipe.xml.ftl b/MVPArtTemplate/recipe.xml.ftl
@@ -1,7 1,9 @@
 <?xml version="1.0"?>
 <#import "root://activities/common/kotlin_macros.ftl" as kt>
 <#import "root://activities/MVPArmsTemplate/dagger2_macros.ftl" as dagger2>
 <recipe>
- <@kt.addAllKotlinDependencies />
 <@kt.addAllKotlinDependencies />
 <@dagger2.addAllKaptDependencies />
 <#if needActivity>
  <merge from="root/AndroidManifest.xml.ftl"
  to="${escapeXmlAttribute(manifestOut)}/AndroidManifest.xml" />