Merge branch 'master' into release-notes

generators/advanced-base/index.js

@@ -35,6 +35,7 @@ class BaseGenerator extends Base {
 
   writing() {
     this.fs.delete(this.destinationPath('__tests__'));
+    this.fs.delete(this.destinationPath('App.js'));
     this.fs.copyTpl(
       this.templatePath('**/*.js'),
       this.destinationPath(''),

generators/assets/README.md

@@ -13,6 +13,8 @@ brew install imagemagick
 
 ## Generate icons
 You'll need a **square** image for your icon with a size of more than **192x192 px** (psd is supported).
+
+### iOS
 Starting with XCode 9, your Apple App Store icon is bundled with the app, so provide an icon with a size of more than **1024x1024 px** (psd is supported).
 
 Then run:
@@ -24,6 +26,14 @@ Answer yes when asked about overwriting.
 That's it! :balloon:
 Icons have been generated in different sizes and integrated in your project.
 
+
+### Android
+- Open your project in Android Studio
+- Right click on the `app` folder, then click on `New` and then click on `Image Asset`
+- In the `Icon Type` field select `Launcher Icons (Adaptative and Legacy)`
+- In the `path`field, select your image file
+- Once done, click on the `Next`button and then on the finish `button`
+
 ## Generate splashscreens
 
 You'll need a **square** image for your splash with a size of more than **2208x2208 px** (psd is supported). The image will be cropped, it should be the logo of the app inside a big square with a 30% margin.

generators/base/index.js

@@ -33,6 +33,7 @@ class BaseGenerator extends Base {
 
   writing() {
     this.fs.delete(this.destinationPath('__tests__'));
+    this.fs.delete(this.destinationPath('App.js'));
     this.fs.copyTpl(
       this.templatePath('**/*.js'),
       this.destinationPath(''),

generators/fastlane-env/index.js

@@ -79,22 +79,20 @@ class FastlaneEnvGenerator extends Base {
         name: 'appName',
         message: 'The app name for this environment',
         default: 'My App',
-        when: answers =>
-          ['hockeyapp', 'appstore'].includes(answers.deploymentPlatform),
       },
       {
         type: 'input',
-        name: 'appNameIOS',
+        name: 'iosAppCenterId',
         message:
-          'The iOS app name for this environment. Name should be different from the Android app and not contain spaces',
+          'The iOS project id on AppCenter, should be different than Android and not contain spaces',
         default: 'MyApp-ios',
         when: answers => answers.deploymentPlatform === 'appcenter',
       },
       {
         type: 'input',
-        name: 'appNameAndroid',
+        name: 'androidAppCenterId',
         message:
-          'The Android app name for this environment. Name should be different from the iOS app and not contain spaces',
+          'The Android project id on AppCenter, should be different than iOS and not contain spaces',
         default: 'MyApp-android',
         when: answers => answers.deploymentPlatform === 'appcenter',
       },

generators/fastlane-env/templates/fastlane/env

@@ -5,8 +5,8 @@ REPO_GIT_BRANCH='<%= repoGitBranch %>'
 
 ### IOS ###
 IOS_PROJECT_PATH='ios'
-<% if (deploymentPlatform !== 'appcenter') { %>IOS_APP_NAME='<%= appName %>'<% } %>
-<% if (deploymentPlatform === 'appcenter') { %>IOS_APP_NAME='<%= appNameIOS %>'<% } %>
+IOS_APP_NAME='<%= appName %>'
+<% if (deploymentPlatform === 'appcenter') { %>IOS_APPCENTER_APP_ID='<%= iosAppCenterId %>'<% } %>
 IOS_PROJECT_NAME='<%= projectName %>'
 IOS_APP_ID='<%= appId %>'
 IOS_TEAM_ID='<%= appleTeamId %>'
@@ -33,7 +33,7 @@ IOS_IPA_PATH='./dist/app.ipa'
 ANDROID_PROJECT_DIR='android'
 ANDROID_APK_PATH='android/app/build/outputs/apk/app-release.apk'
 GRADLE_APP_IDENTIFIER='<%= appId %>'
-<% if (deploymentPlatform !== 'appcenter') { %>GRADLE_APP_NAME='<%= appName %>'<% } %>
-<% if (deploymentPlatform === 'appcenter') { %>GRADLE_APP_NAME='<%= appNameAndroid %>'<% } %>
+GRADLE_APP_NAME='<%= appName %>'
+<% if (deploymentPlatform === 'appcenter') { %>ANDROID_APPCENTER_APP_ID='<%= androidAppCenterId %>'<% } %>
 GRADLE_KEYSTORE='<%= lowerCaseProjectName %>.<%= environmentName %>.keystore'
 GRADLE_KEYSTORE_ALIAS='<%= lowerCaseProjectName %>'

generators/fastlane-setup/templates/fastlane/Fastfile

@@ -108,7 +108,7 @@ platform :ios do
     appcenter_upload(
       api_token: ENV['FL_APPCENTER_API_TOKEN'],
       owner_name: ENV['APPCENTER_USERNAME'],
-      app_name: ENV['IOS_APP_NAME'],
+      app_name: ENV['IOS_APPCENTER_APP_ID'],
       ipa: ENV['IOS_IPA_PATH'],
       release_notes: %x[#{release_notes_command}]
     )
@@ -161,7 +161,7 @@ platform :android do
     appcenter_upload(
       api_token: ENV['FL_APPCENTER_API_TOKEN'],
       owner_name: ENV['APPCENTER_USERNAME'],
-      app_name: ENV['GRADLE_APP_NAME'],
+      app_name: ENV['ANDROID_APPCENTER_APP_ID'],
       apk: ENV['ANDROID_APK_PATH'],
       release_notes: %x[#{release_notes_command}]
     )

package.json

@@ -6,8 +6,9 @@
     "lint": "eslint .",
     "test": "echo \"Error: no test specified\" && exit 0",
     "commitmsg": "validate-commit-msg",
-    "semantic-release": "semantic-release pre && npm publish && semantic-release post",
-    "commit": "git-cz"
+    "semantic-release": "semantic-release",
+    "commit": "git-cz",
+    "travis-deploy-once": "travis-deploy-once"
   },
   "keywords": [
     "yeoman-generator",
@@ -52,7 +53,8 @@
     "husky": "^0.14.3",
     "jest": "^21.2.1",
     "prettier": "^1.11.1",
-    "semantic-release": "^8.2.0",
+    "semantic-release": "^15.9.9",
+    "travis-deploy-once": "^5.0.2",
     "validate-commit-msg": "^2.14.0",
     "yeoman-environment": "^2.0.5",
     "yeoman-test": "^1.7.0"