Merge branch 'master' into lacasseio/kotlin/build-script-conversion

.github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
 <!--- 
 Please follow the instructions below. We receive dozens of issues every week, so to stay productive, we will close issues that don't provide enough information. 
 
@@ -9,22 +18,20 @@ Please open Gradle Native-related issues at https://github.com/gradle/gradle-nat
 <!--- Provide a brief summary of the issue in the title above -->
 
 ### Expected Behavior
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
+<!--- Tell us what should happen -->
 
 ### Current Behavior
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+<!--- Tell us what happens instead of the expected behavior -->
 
 ### Context
 <!--- How has this issue affected you? What are you trying to accomplish? -->
 <!--- Providing context helps us come up with a solution that is most useful in the real world -->
 
-### Steps to Reproduce (for bugs)
+### Steps to Reproduce 
 <!--- Provide a self-contained example project (as an attached archive or a Github project). -->
 <!--- In the rare cases where this is infeasible, we will also accept a detailed set of instructions. -->
 
 ### Your Environment
 <!--- Include as many relevant details about the environment you experienced the bug in -->
-<!--- A build scan `https://scans.gradle.com/get-started` is ideal -->
- * Build scan URL: 
+<!--- A build scan https://scans.gradle.com/get-started is ideal -->
+Build scan URL:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,28 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--- 
+Please follow the instructions below. We receive dozens of issues every week, so to stay productive, we will close issues that don't provide enough information. 
+
+Please open Android-related issues on the Android Issue Tracker at https://source.android.com/source/report-bugs
+Please open Kotlin DSL-related issues at https://github.com/gradle/kotlin-dsl/issues
+Please open Gradle Native-related issues at https://github.com/gradle/gradle-native/issues
+-->
+
+<!--- Provide a brief summary of the issue in the title above -->
+
+### Expected Behavior
+<!--- Tell us how it should work -->
+
+### Current Behavior
+<!--- Explain the difference from current behavior -->
+
+### Context
+<!--- How has this issue affected you? What are you trying to accomplish? What other alternatives have you considered? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->

.github/ISSUE_TEMPLATE/regression.md

@@ -0,0 +1,34 @@
+---
+name: Regression
+about: Report a problem about something that used to work
+title: ''
+labels: a:regression
+assignees: ''
+
+---
+
+<!--- 
+Please use our bug report template to report problems with something that has never worked.  Regressions reports are greatly appreciated during our RC phase and before a final release.
+-->
+
+<!--- Provide a brief summary of the issue in the title above -->
+
+### Expected Behavior
+<!--- Tell us what should happen -->
+
+### Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+### Context
+<!--- Which version did this stop working with? Which version do you know it works? -->
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+### Steps to Reproduce 
+<!--- Provide a self-contained example project (as an attached archive or a Github project). -->
+<!--- In the rare cases where this is infeasible, we will also accept a detailed set of instructions. -->
+
+### Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+<!--- A build scan https://scans.gradle.com/get-started is ideal -->
+Build scan URL:

.github/SUPPORT.md

@@ -0,0 +1,9 @@
+# Getting Help with Gradle
+
+You can search for [help](https://gradle.org/help/) across our website, forums and StackOverflow.
+
+You can attend one of our [FREE online classes](https://gradle.org/training/).
+
+You can subscribe to our [monthly newsletter](https://newsletter.gradle.com/).
+
+We have lots of [other resources](https://gradle.org/resources/) to help you learn more about Gradle.

.teamcity/Gradle_Check/configurations/BaseGradleBuildType.kt

@@ -1,7 +1,7 @@
 package configurations
 
+import common.BuildCache
 import jetbrains.buildServer.configs.kotlin.v2018_2.BuildType
-import model.BuildCache
 import model.CIBuildModel
 import model.Stage
 

.teamcity/Gradle_Check/configurations/FunctionalTest.kt

@@ -1,8 +1,8 @@
 package configurations
 
+import common.Os
 import jetbrains.buildServer.configs.kotlin.v2018_2.AbsoluteId
 import model.CIBuildModel
-import model.OS
 import model.Stage
 import model.TestCoverage
 import model.TestType
@@ -33,7 +33,7 @@ class FunctionalTest(model: CIBuildModel, testCoverage: TestCoverage, subProject
 
     params {
         param("env.JAVA_HOME", "%${testCoverage.os}.${testCoverage.buildJvmVersion}.openjdk.64bit%")
-        if (testCoverage.os == OS.linux) {
+        if (testCoverage.os == Os.linux) {
             param("env.ANDROID_HOME", "/opt/android/sdk")
         }
     }