Reorganized maven examples

maven/hello-world/.gitignore → maven/.gitignore

@@ -1,2 +1,4 @@
-target
 .idea
+*.iml
+
+target

maven/dagger-maven-example/pom.xml → maven/dagger-example/pom.xml

@@ -1,37 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jetbrains.kotlin.examples</groupId>
+    <parent>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-examples</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
     <artifactId>dagger-maven-example</artifactId>
-    <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <kotlin.version>1.1-SNAPSHOT</kotlin.version>
-        <junit.version>4.12</junit.version>
-        <main.class>coffee.CoffeeApp</main.class>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <dagger.version>2.29</dagger.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.google.dagger</groupId>
             <artifactId>dagger</artifactId>
-            <version>2.9</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
+            <version>${dagger.version}</version>
         </dependency>
     </dependencies>
 
@@ -50,13 +40,12 @@
                         <configuration>
                             <sourceDirs>
                                 <sourceDir>src/main/kotlin</sourceDir>
-                                <sourceDir>src/main/java</sourceDir>
                             </sourceDirs>
                             <annotationProcessorPaths>
                                 <annotationProcessorPath>
                                     <groupId>com.google.dagger</groupId>
                                     <artifactId>dagger-compiler</artifactId>
-                                    <version>2.9</version>
+                                    <version>${dagger.version}</version>
                                 </annotationProcessorPath>
                             </annotationProcessorPaths>
                         </configuration>
@@ -69,7 +58,6 @@
                         <configuration>
                             <sourceDirs>
                                 <sourceDir>src/main/kotlin</sourceDir>
-                                <sourceDir>src/main/java</sourceDir>
                             </sourceDirs>
                         </configuration>
                     </execution>
@@ -81,13 +69,12 @@
                         <configuration>
                             <sourceDirs>
                                 <sourceDir>src/test/kotlin</sourceDir>
-                                <sourceDir>src/test/java</sourceDir>
                             </sourceDirs>
                             <annotationProcessorPaths>
                                 <annotationProcessorPath>
                                     <groupId>com.google.dagger</groupId>
                                     <artifactId>dagger-compiler</artifactId>
-                                    <version>2.9</version>
+                                    <version>${dagger.version}</version>
                                 </annotationProcessorPath>
                             </annotationProcessorPaths>
                         </configuration>
@@ -100,48 +87,16 @@
                         <configuration>
                             <sourceDirs>
                                 <sourceDir>src/test/kotlin</sourceDir>
-                                <sourceDir>src/test/java</sourceDir>
                                 <sourceDir>target/generated-sources/kapt/test</sourceDir>
                             </sourceDirs>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <proc>none</proc>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-                <executions>
-                    <!-- Replacing default-compile as it is treated specially by maven -->
-                    <execution>
-                        <id>default-compile</id>
-                        <phase>none</phase>
-                    </execution>
-                    <!-- Replacing default-testCompile as it is treated specially by maven -->
-                    <execution>
-                        <id>default-testCompile</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>java-compile</id>
-                        <phase>compile</phase>
-                        <goals> 
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>java-test-compile</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>

maven/dagger-maven-example/src/main/kotlin/CoffeeMaker.kt → maven/dagger-example/src/main/kotlin/examples/dagger/CoffeeMaker.kt

@@ -1,4 +1,4 @@
-package coffee
+package examples.dagger
 
 import dagger.Lazy
 import javax.inject.Inject
@@ -14,4 +14,5 @@ class CoffeeMaker @Inject constructor(
         println(" [_]P coffee! [_]P ")
         heater.get().off()
     }
+
 }

maven/dagger-maven-example/src/main/kotlin/DripCoffeeModule.kt → maven/dagger-example/src/main/kotlin/examples/dagger/DripCoffeeModule.kt

@@ -1,13 +1,16 @@
-package coffee
+package examples.dagger
 
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton
 
-@Module(includes = arrayOf(PumpModule::class))
+@Module(includes = [PumpModule::class])
 class DripCoffeeModule {
-    @Provides @Singleton
+
+    @Provides
+    @Singleton
     fun provideHeater(): Heater {
         return ElectricHeater()
     }
+
 }

maven/dagger-maven-example/src/main/kotlin/ElectricHeater.kt → maven/dagger-example/src/main/kotlin/examples/dagger/ElectricHeater.kt

@@ -1,6 +1,7 @@
-package coffee
+package examples.dagger
 
 open class ElectricHeater : Heater {
+
     override var isHot: Boolean = false
 
     override fun on() {
@@ -11,4 +12,5 @@ open class ElectricHeater : Heater {
     override fun off() {
         this.isHot = false
     }
+
 }

maven/dagger-maven-example/src/main/kotlin/Heater.kt → maven/dagger-example/src/main/kotlin/examples/dagger/Heater.kt

@@ -1,7 +1,9 @@
-package coffee
+package examples.dagger
 
 interface Heater {
+
     fun on()
     fun off()
     val isHot: Boolean
+
 }

maven/dagger-maven-example/src/main/kotlin/Pump.kt → maven/dagger-example/src/main/kotlin/examples/dagger/Pump.kt

@@ -1,5 +1,7 @@
-package coffee
+package examples.dagger
 
 interface Pump {
+
     fun pump()
+
 }

maven/dagger-maven-example/src/main/kotlin/PumpModule.kt → maven/dagger-example/src/main/kotlin/examples/dagger/PumpModule.kt

@@ -1,10 +1,12 @@
-package coffee
+package examples.dagger
 
 import dagger.Binds
 import dagger.Module
 
 @Module
 abstract class PumpModule {
+
     @Binds
     abstract fun providePump(pump: Thermosiphon): Pump
+
 }

maven/dagger-maven-example/src/main/kotlin/Thermosiphon.kt → maven/dagger-example/src/main/kotlin/examples/dagger/Thermosiphon.kt

@@ -1,12 +1,15 @@
-package coffee
+package examples.dagger
 
 import javax.inject.Inject
 
-class Thermosiphon @Inject
-constructor(private val heater: Heater) : Pump {
+class Thermosiphon @Inject constructor(
+        private val heater: Heater
+) : Pump {
+
     override fun pump() {
         if (heater.isHot) {
             println("=> => pumping => =>")
         }
     }
+
 }

maven/dagger-maven-example/src/test/kotlin/hello/tests/ExampleTest.kt → maven/dagger-example/src/test/kotlin/examples/dagger/ExampleTest.kt

@@ -1,24 +1,26 @@
-package hello.tests
+package examples.dagger
 
-import coffee.*
 import dagger.Component
 import dagger.Module
 import dagger.Provides
-import junit.framework.TestCase
+import org.junit.Test
 import javax.inject.Singleton
 
 private var executed = false
 
-class ExampleTest : TestCase() {
+class ExampleTest {
+
     @Singleton
-    @Component(modules = arrayOf(TestCoffeeModule::class))
+    @Component(modules = [TestCoffeeModule::class])
     interface Coffee {
         fun maker(): CoffeeMaker
     }
 
-    @Module(includes = arrayOf(PumpModule::class))
+    @Module(includes = [PumpModule::class])
     class TestCoffeeModule {
-        @Provides @Singleton
+
+        @Provides
+        @Singleton
         fun provideHeater(): Heater {
             return object: ElectricHeater() {
                 override fun on() {
@@ -31,9 +33,11 @@ class ExampleTest : TestCase() {
         }
     }
 
-    fun testAssert() {
+    @Test
+    fun shouldBrewCoffee() {
         val coffee = DaggerExampleTest_Coffee.builder().build()
         coffee.maker().brew()
         assert(executed)
     }
+
 }

maven/dokka-maven-example/Module.md → maven/dokka-example/MODULE.md

@@ -1,4 +1,4 @@
-# Module dokka-maven-example
+# Module dokka-example
 
 This is an example of how you can write module documentation with Dokka.
 

maven/dokka-maven-example/pom.xml → maven/dokka-example/pom.xml

@@ -2,24 +2,21 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.jetbrains.kotlin.examples</groupId>
-    <artifactId>kotlin-maven-example</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <parent>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-examples</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>dokka-example</artifactId>
+
     <properties>
-        <kotlin.version>1.0.3</kotlin.version>
-        <dokka.version>0.10.0</dokka.version>
+        <dokka.version>1.4.10</dokka.version>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
 
@@ -32,18 +29,14 @@
                 <executions>
                     <execution>
                         <id>compile</id>
-                        <phase>compile</phase>
                         <goals>
                             <goal>compile</goal>
                         </goals>
-                    </execution>
-
-                    <execution>
-                        <id>test-compile</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                          <goal>test-compile</goal>
-                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>src/main/kotlin</sourceDir>
+                            </sourceDirs>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -63,12 +56,12 @@
                 </executions>
                 <configuration>
                     <includes>
-                        <include>Module.md</include>
+                        <include>MODULE.md</include>
                     </includes>
                     <sourceLinks>
                         <link>
                             <path>${project.basedir}</path>
-                            <url>https://github.com/JetBrains/kotlin-examples/blob/master/maven/dokka-maven-example</url>
+                            <url>https://github.com/JetBrains/kotlin-examples/blob/master/maven/dokka-example</url>
                             <lineSuffix>#L</lineSuffix>
                         </link>
                     </sourceLinks>