Skip to content

Commit

Permalink
Merge pull request #2 from tuliohmendes/master
Browse files Browse the repository at this point in the history 
Add missing replacements across templates
  • Loading branch information
@ravidsrk
ravidsrk committed May 11, 2017
2 parents 237079e + ee4b878 commit c1da0b9
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions generators/app/index.js
View file
Expand Up @@ -90,9 +90,9 @@ module.exports = Generator.extend({
this.fs.copy(this.sourceRoot() + '/' + this.props.architecture + '/gradlew.bat', 'gradlew.bat');
this.fs.copy(this.sourceRoot() + '/' + this.props.architecture + '/settings.gradle', 'settings.gradle');
this.fs.copy(this.sourceRoot() + '/' + this.props.architecture + '/app/gitignore', 'app/.gitignore');
this.fs.copy(this.sourceRoot() + '/' + this.props.architecture + '/app/proguard-rules.pro', 'app/proguard-rules.pro');

this.fs.copyTpl(this.sourceRoot() + '/' + this.props.architecture + '/app/build.gradle', 'app/build.gradle');
this.fs.copyTpl(this.sourceRoot() + '/' + this.props.architecture + '/app/proguard-rules.pro', 'app/proguard-rules.pro', this.props);
this.fs.copyTpl(this.sourceRoot() + '/' + this.props.architecture + '/app/build.gradle', 'app/build.gradle', this.props);
this.fs.copyTpl(this.sourceRoot() + '/' + this.props.architecture + '/app/src/androidTest/java/com/example/android/architecture/blueprints/todoapp', 'app/src/androidTest/java/' + packageDir, this.props);
this.fs.copyTpl(this.sourceRoot() + '/' + this.props.architecture + '/app/src/androidTestMock/java/com/example/android/architecture/blueprints/todoapp', 'app/src/androidTestMock/java/' + packageDir, this.props);
this.fs.copyTpl(this.sourceRoot() + '/' + this.props.architecture + '/app/src/main/java/com/example/android/architecture/blueprints/todoapp', 'app/src/main/java/' + packageDir, this.props);
Expand Down
2 changes: 1 addition & 1 deletion generators/app/templates/todo-databinding/app/build.gradle
View file
Expand Up @@ -5,7 +5,7 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.example.android.architecture.blueprints.tododatabinding"
applicationId "<%= appPackage %>"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
Expand Down
4 changes: 2 additions & 2 deletions generators/app/templates/todo-databinding/app/proguard-rules.pro
View file
@@ -1,5 +1,5 @@
# Some methods are only called from tests, so make sure the shrinker keeps them.
-keep class com.example.android.architecture.blueprints.** { *; }
-keep class <%= appPackage %>.** { *; }

-keep class android.support.v4.widget.DrawerLayout { *; }
-keep class android.support.test.espresso.IdlingResource { *; }
Expand All @@ -25,4 +25,4 @@
-dontwarn org.hamcrest.**
-dontwarn com.squareup.javawriter.JavaWriter
# Uncomment this if you use Mockito
-dontwarn org.mockito.**
-dontwarn org.mockito.**
2 changes: 1 addition & 1 deletion generators/app/templates/todo-mvp-clean/app/build.gradle
View file
Expand Up @@ -5,7 +5,7 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.example.android.architecture.blueprints.todomvpclean"
applicationId "<%= appPackage %>"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
Expand Down
4 changes: 2 additions & 2 deletions generators/app/templates/todo-mvp-clean/app/proguard-rules.pro
View file
@@ -1,5 +1,5 @@
# Some methods are only called from tests, so make sure the shrinker keeps them.
-keep class com.example.android.architecture.blueprints.** { *; }
-keep class <%= appPackage %>.** { *; }

-keep class android.support.v4.widget.DrawerLayout { *; }
-keep class android.support.test.espresso.IdlingResource { *; }
Expand All @@ -24,4 +24,4 @@
-dontwarn org.hamcrest.**
-dontwarn com.squareup.javawriter.JavaWriter
# Uncomment this if you use Mockito
-dontwarn org.mockito.**
-dontwarn org.mockito.**
2 changes: 1 addition & 1 deletion generators/app/templates/todo-mvp-contentproviders/app/build.gradle
View file
Expand Up @@ -5,7 +5,7 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.example.android.architecture.blueprints.todomvpcontentproviders"
applicationId "<%= appPackage %>"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
Expand Down
4 changes: 2 additions & 2 deletions generators/app/templates/todo-mvp-contentproviders/app/proguard-rules.pro
View file
@@ -1,5 +1,5 @@
# Some methods are only called from tests, so make sure the shrinker keeps them.
-keep class com.example.android.architecture.blueprints.** { *; }
-keep class <%= appPackage %>.** { *; }

-keep class android.support.v4.widget.DrawerLayout { *; }
-keep class android.support.test.espresso.IdlingResource { *; }
Expand All @@ -24,4 +24,4 @@
-dontwarn org.hamcrest.**
-dontwarn com.squareup.javawriter.JavaWriter
# Uncomment this if you use Mockito
-dontwarn org.mockito.**
-dontwarn org.mockito.**
2 changes: 1 addition & 1 deletion generators/app/templates/todo-mvp-dagger/app/build.gradle
View file
Expand Up @@ -6,7 +6,7 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.example.android.architecture.blueprints.todomvpdagger"
applicationId "<%= appPackage %>"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
Expand Down
4 changes: 2 additions & 2 deletions generators/app/templates/todo-mvp-dagger/app/proguard-rules.pro
View file
@@ -1,5 +1,5 @@
# Some methods are only called from tests, so make sure the shrinker keeps them.
-keep class com.example.android.architecture.blueprints.** { *; }
-keep class <%= appPackage %>.** { *; }

-keep class android.support.v4.widget.DrawerLayout { *; }
-keep class android.support.test.espresso.IdlingResource { *; }
Expand All @@ -24,4 +24,4 @@
-dontwarn org.hamcrest.**
-dontwarn com.squareup.javawriter.JavaWriter
# Uncomment this if you use Mockito
-dontwarn org.mockito.**
-dontwarn org.mockito.**
2 changes: 1 addition & 1 deletion generators/app/templates/todo-mvp-loaders/app/build.gradle
View file
Expand Up @@ -5,7 +5,7 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.example.android.architecture.blueprints.todomvploaders"
applicationId "<%= appPackage %>"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
Expand Down
4 changes: 2 additions & 2 deletions generators/app/templates/todo-mvp-loaders/app/proguard-rules.pro
View file
@@ -1,5 +1,5 @@
# Some methods are only called from tests, so make sure the shrinker keeps them.
-keep class com.example.android.architecture.blueprints.** { *; }
-keep class <%= appPackage %>.** { *; }

-keep class android.support.v4.widget.DrawerLayout { *; }
-keep class android.support.test.espresso.IdlingResource { *; }
Expand All @@ -24,4 +24,4 @@
-dontwarn org.hamcrest.**
-dontwarn com.squareup.javawriter.JavaWriter
# Uncomment this if you use Mockito
-dontwarn org.mockito.**
-dontwarn org.mockito.**
2 changes: 1 addition & 1 deletion generators/app/templates/todo-mvp-rxjava/app/build.gradle
View file
Expand Up @@ -5,7 +5,7 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.example.android.architecture.blueprints.todomvp"
applicationId "<%= appPackage %>"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
Expand Down
4 changes: 2 additions & 2 deletions generators/app/templates/todo-mvp-rxjava/app/proguard-rules.pro
View file
@@ -1,5 +1,5 @@
# Some methods are only called from tests, so make sure the shrinker keeps them.
-keep class com.example.android.architecture.blueprints.** { *; }
-keep class <%= appPackage %>.** { *; }

-keep class android.support.v4.widget.DrawerLayout { *; }
-keep class android.support.test.espresso.IdlingResource { *; }
Expand Down Expand Up @@ -29,4 +29,4 @@
# rxjava
-keep class rx.observers.TestSubscriber {
public <methods>;
}
}
2 changes: 1 addition & 1 deletion generators/app/templates/todo-mvp/app/build.gradle
View file
Expand Up @@ -5,7 +5,7 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.example.android.architecture.blueprints.todomvp"
applicationId "<%= appPackage %>"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
Expand Down
4 changes: 2 additions & 2 deletions generators/app/templates/todo-mvp/app/proguard-rules.pro
View file
@@ -1,5 +1,5 @@
# Some methods are only called from tests, so make sure the shrinker keeps them.
-keep class com.example.android.architecture.blueprints.** { *; }
-keep class <%= appPackage %>.** { *; }

-keep class android.support.v4.widget.DrawerLayout { *; }
-keep class android.support.test.espresso.IdlingResource { *; }
Expand All @@ -24,4 +24,4 @@
-dontwarn org.hamcrest.**
-dontwarn com.squareup.javawriter.JavaWriter
# Uncomment this if you use Mockito
-dontwarn org.mockito.**
-dontwarn org.mockito.**
2 changes: 1 addition & 1 deletion generators/app/templates/todo-mvvm-databinding/app/build.gradle
View file
Expand Up @@ -5,7 +5,7 @@ android {
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.example.android.architecture.blueprints.tododatabinding"
applicationId "<%= appPackage %>"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
Expand Down
4 changes: 2 additions & 2 deletions generators/app/templates/todo-mvvm-databinding/app/proguard-rules.pro
View file
@@ -1,5 +1,5 @@
# Some methods are only called from tests, so make sure the shrinker keeps them.
-keep class com.example.android.architecture.blueprints.** { *; }
-keep class <%= appPackage %>.** { *; }

-keep class android.support.v4.widget.DrawerLayout { *; }
-keep class android.support.test.espresso.IdlingResource { *; }
Expand All @@ -25,4 +25,4 @@
-dontwarn org.hamcrest.**
-dontwarn com.squareup.javawriter.JavaWriter
# Uncomment this if you use Mockito
-dontwarn org.mockito.**
-dontwarn org.mockito.**

0 comments on commit c1da0b9

Please sign in to comment.