Skip to content

Commit

Permalink
Merge branch 'release/0.22.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
matkoch committed Sep 17, 2019
2 parents 51e3904 + 36cf461 commit d8347f9
Show file tree
Hide file tree
Showing 177 changed files with 9,339 additions and 2,419 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ csharp_style_throw_expression = true:warning
csharp_style_conditional_delegate_call = true:warning

# Newline settings
csharp_new_line_before_open_brace = all:warning
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true:warning
csharp_new_line_before_catch = true:warning
csharp_new_line_before_finally = true:warning
Expand Down
72 changes: 72 additions & 0 deletions .teamcity/NUKE_GENERATED.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="kotlin-language" name="Kotlin">
<configuration version="3" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings />
<compilerArguments>
<option name="languageVersion" value="1.2" />
<option name="apiVersion" value="1.2" />
<option name="pluginOptions">
<array />
</option>
<option name="pluginClasspaths">
<array />
</option>
<option name="coroutinesState" value="warn" />
<option name="errors">
<ArgumentParseErrors />
</option>
</compilerArguments>
</configuration>
</facet>
</component>
<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$">
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin:2019.1" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.2.50" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.50" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.2.50" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-converters:2019.1" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-investigations-auto-assigner:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-ant:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-jira:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-perforce:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-tfs:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-charisma:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-commit-status-publisher:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-swabra:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-bundled:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-svn:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-jetbrains.git:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-bugzilla:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-pull-requests:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-docker-support:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-golang:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-teamcity-kubernetes-plugin:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-dotnet.cli:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-ssh-manager:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-Maven2:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-perfmon:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-teamcity-bazel-plugin:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-dotNetPackagesSupport:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-visualstudiotest:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-dotNetRunners:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-file-content-replacer:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-commandLineRunner:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-powershell:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-mercurial:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.teamcity:configs-dsl-kotlin-gradle:1.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.50" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.50" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-script-runtime:1.2.50" level="project" />
</component>
</module>
104 changes: 104 additions & 0 deletions .teamcity/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<?xml version="1.0"?>
<project>
<modelVersion>4.0.0</modelVersion>
<name>TeamCity Config DSL Script</name>
<groupId>NUKE_GENERATED</groupId>
<artifactId>NUKE_GENERATED</artifactId>
<version>1.0-SNAPSHOT</version>

<parent>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>configs-dsl-kotlin-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>

<repositories>
<repository>
<id>jetbrains-all</id>
<url>http://download.jetbrains.com/teamcity-repository</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>teamcity-server</id>
<url>https://teamcity.jetbrains.com/app/dsl-plugins-repository</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>JetBrains</id>
<url>http://download.jetbrains.com/teamcity-repository</url>
</pluginRepository>
</pluginRepositories>

<build>
<sourceDirectory>.</sourceDirectory>
<plugins>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version>

<configuration/>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>process-test-sources</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>teamcity-configs-maven-plugin</artifactId>
<version>${teamcity.dsl.version}</version>
<configuration>
<format>kotlin</format>
<dstDir>target/generated-configs</dstDir>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>configs-dsl-kotlin</artifactId>
<version>${teamcity.dsl.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.teamcity</groupId>
<artifactId>configs-dsl-kotlin-plugins</artifactId>
<version>1.0-SNAPSHOT</version>
<type>pom</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-script-runtime</artifactId>
<version>${kotlin.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit d8347f9

Please sign in to comment.