Feat: Config for spotless header check

ocfmem · Feb 4, 2020 · 1344801 · 1344801
1 parent 0259f8c
commit 1344801
Show file tree

Hide file tree

Showing 21 changed files with 195 additions and 39 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -19,10 +19,12 @@ ext {
     timestamp = new Date().format('yyyyMMdd')
 }
 
-subprojects {
+allprojects {
 
     group 'org.eclipse.keyple'
     apply plugin: 'pmd'
+    apply plugin: 'org.jetbrains.dokka'
+    apply plugin: "com.diffplug.gradle.spotless"
 
     repositories {
         mavenLocal()
@@ -43,10 +45,46 @@ subprojects {
                 "java-braces",
         ]
     }
-
 }
 
+subprojects{
 
+    dokka {
+        outputFormat = 'html'
+        outputDirectory = "$buildDir/javadoc"
+    }
+
+    spotless {
+        kotlin {
+            target "**/*.kt"
+            ktlint()
+
+            // also supports license headers
+            licenseHeader '/********************************************************************************\n' +
+                    ' * Copyright (c) $YEAR Calypso Networks Association https://www.calypsonet-asso.org/\n' +
+                    ' *\n' +
+                    ' * See the NOTICE file(s) distributed with this work for additional information regarding copyright\n' +
+                    ' * ownership.\n' +
+                    ' *\n' +
+                    ' * This program and the accompanying materials are made available under the terms of the Eclipse\n' +
+                    ' * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0\n' +
+                    ' *\n' +
+                    ' * SPDX-License-Identifier: EPL-2.0\n' +
+                    ' ********************************************************************************/'
+        }
+    }
+}
+
+task javadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
+    outputFormat = 'javadoc'
+    outputDirectory = dokka.outputDirectory
+    inputs.dir 'src/main/kotlin'
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from dokka.outputDirectory
+}
 
 //create task for to agragate javadoc
 /*

diff --git a/android/keyple-plugin/android-omapi/build.gradle b/android/keyple-plugin/android-omapi/build.gradle
@@ -4,8 +4,6 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'org.jetbrains.dokka'
-apply plugin: "com.diffplug.gradle.spotless"
 
 def version = "0.9.0"
 
@@ -51,11 +49,6 @@ android {
         abortOnError false
     }
 
-    dokka {
-        outputFormat = 'html'
-        outputDirectory = "$buildDir/javadoc"
-    }
-
     //generate output aar with a qualified name : with version number
     libraryVariants.all { variant ->
         variant.outputs.all { output ->
@@ -105,17 +98,6 @@ android {
 
 }
 
-task javadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
-    outputFormat = 'javadoc'
-    outputDirectory = dokka.outputDirectory
-    inputs.dir 'src/main/kotlin'
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from dokka.outputDirectory
-}
-
 //build sources jar
 task androidSourcesJar(type: Jar) {
     classifier = 'sources'
@@ -244,10 +226,3 @@ dependencies {
     /** Mockk**/
     testImplementation "io.mockk:mockk:1.9"
 }
-
-spotless {
-    kotlin {
-        target "**/*.kt"
-        ktlint()
-    }
-}
diff --git a/...droid-omapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiPlugin.kt b/...droid-omapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiPlugin.kt
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 Calypso Networks Association https://www.calypsonet-asso.org/
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
  *
  * See the NOTICE file(s) distributed with this work for additional information regarding copyright
  * ownership.
@@ -8,7 +8,7 @@
  * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
  *
  * SPDX-License-Identifier: EPL-2.0
- */
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi
 
 import android.content.Context

diff --git a/...mapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiPluginFactory.kt b/...mapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiPluginFactory.kt
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 Calypso Networks Association https://www.calypsonet-asso.org/
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
  *
  * See the NOTICE file(s) distributed with this work for additional information regarding copyright
  * ownership.
@@ -8,7 +8,7 @@
  * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
  *
  * SPDX-License-Identifier: EPL-2.0
- */
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi
 
 import android.content.Context

diff --git a/...droid-omapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiReader.kt b/...droid-omapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiReader.kt
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 Calypso Networks Association https://www.calypsonet-asso.org/
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
  *
  * See the NOTICE file(s) distributed with this work for additional information regarding copyright
  * ownership.
@@ -8,7 +8,7 @@
  * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
  *
  * SPDX-License-Identifier: EPL-2.0
- */
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi
 
 import java.util.HashMap

diff --git a/...ndroid-omapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/ISeServiceFactory.kt b/...ndroid-omapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/ISeServiceFactory.kt
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2018 Calypso Networks Association https://www.calypsonet-asso.org/
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
  *
  * See the NOTICE file(s) distributed with this work for additional information regarding copyright
  * ownership.
@@ -8,7 +8,7 @@
  * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
  *
  * SPDX-License-Identifier: EPL-2.0
- */
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi
 
 internal interface ISeServiceFactory<T, V> {

diff --git a/...mapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/se/AndroidOmapiPluginImpl.kt b/...mapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/se/AndroidOmapiPluginImpl.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi.se
 
 import android.content.Context

diff --git a/...mapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/se/AndroidOmapiReaderImpl.kt b/...mapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/se/AndroidOmapiReaderImpl.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi.se
 
 import android.se.omapi.Channel

diff --git a/...-omapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/se/SeServiceFactoryImpl.kt b/...-omapi/src/main/kotlin/org/eclipse/keyple/plugin/android/omapi/se/SeServiceFactoryImpl.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi.se
 
 import android.content.Context

diff --git a/...main/kotlin/org/eclipse/keyple/plugin/android/omapi/simalliance/AndroidOmapiPluginImpl.kt b/...main/kotlin/org/eclipse/keyple/plugin/android/omapi/simalliance/AndroidOmapiPluginImpl.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi.simalliance
 
 import android.content.Context

diff --git a/...main/kotlin/org/eclipse/keyple/plugin/android/omapi/simalliance/AndroidOmapiReaderImpl.kt b/...main/kotlin/org/eclipse/keyple/plugin/android/omapi/simalliance/AndroidOmapiReaderImpl.kt
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2018 Calypso Networks Association https://www.calypsonet-asso.org/
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
  *
  * See the NOTICE file(s) distributed with this work for additional information regarding copyright
  * ownership.
@@ -8,7 +8,7 @@
  * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
  *
  * SPDX-License-Identifier: EPL-2.0
- */
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi.simalliance
 
 import java.io.IOException

diff --git a/...c/main/kotlin/org/eclipse/keyple/plugin/android/omapi/simalliance/SeServiceFactoryImpl.kt b/...c/main/kotlin/org/eclipse/keyple/plugin/android/omapi/simalliance/SeServiceFactoryImpl.kt
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2018 Calypso Networks Association https://www.calypsonet-asso.org/
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
  *
  * See the NOTICE file(s) distributed with this work for additional information regarding copyright
  * ownership.
@@ -8,7 +8,7 @@
  * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
  *
  * SPDX-License-Identifier: EPL-2.0
- */
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi.simalliance
 
 import android.content.Context

diff --git a/.../src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiPluginFactoryTest.kt b/.../src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiPluginFactoryTest.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi
 
 import android.content.Context

diff --git a/...d-omapi/src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiPluginTest.kt b/...d-omapi/src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiPluginTest.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi
 
 import android.content.Context

diff --git a/...d-omapi/src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiReaderTest.kt b/...d-omapi/src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/AndroidOmapiReaderTest.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi
 
 import io.mockk.MockKAnnotations

diff --git a/.../src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/se/AndroidOmapiPluginImplTest.kt b/.../src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/se/AndroidOmapiPluginImplTest.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi.se
 
 import android.content.Context

diff --git a/.../src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/se/AndroidOmapiReaderImplTest.kt b/.../src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/se/AndroidOmapiReaderImplTest.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi.se
 
 import android.se.omapi.Channel

diff --git a/...pi/src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/se/SeServiceFactoryImplTest.kt b/...pi/src/test/kotlin/org/eclipse/keyple/plugin/android/omapi/se/SeServiceFactoryImplTest.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi.se
 
 import android.content.Context

diff --git a/.../kotlin/org/eclipse/keyple/plugin/android/omapi/simalliance/AndroidOmapiPluginImplTest.kt b/.../kotlin/org/eclipse/keyple/plugin/android/omapi/simalliance/AndroidOmapiPluginImplTest.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi.simalliance
 
 import android.content.Context

diff --git a/.../kotlin/org/eclipse/keyple/plugin/android/omapi/simalliance/AndroidOmapiReaderImplTest.kt b/.../kotlin/org/eclipse/keyple/plugin/android/omapi/simalliance/AndroidOmapiReaderImplTest.kt
@@ -1,3 +1,14 @@
+/********************************************************************************
+ * Copyright (c) 2020 Calypso Networks Association https://www.calypsonet-asso.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information regarding copyright
+ * ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 package org.eclipse.keyple.plugin.android.omapi.simalliance
 
 import io.mockk.every