Fix tests. Port serialization. Unfortunately the canary is still needed

when reading.

build.gradle.kts

@@ -44,10 +44,12 @@ allprojects {
         maven("https://dl.bintray.com/jetbrains/spek")
         maven("https://dl.bintray.com/kotlin/kotlin-eap")
     }
+/*
 
     tasks.withType<KotlinCompile> {
         kotlinOptions.jvmTarget = "1.8"
     }
+*/
 }
 
 idea {

core/build.gradle.kts

@@ -14,22 +14,6 @@
  * see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * Copyright (c) 2018.
- *
- * This file is part of ProcessManager.
- *
- * ProcessManager is free software: you can redistribute it and/or modify it under the terms of version 3 of the
- * GNU Lesser General Public License as published by the Free Software Foundation.
- *
- * ProcessManager is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with ProcessManager.  If not,
- * see <http://www.gnu.org/licenses/>.
- */
-
 import com.jfrog.bintray.gradle.BintrayExtension
 import net.devrieze.gradle.ext.doPublish
 import net.devrieze.gradle.ext.fromPreset
@@ -72,6 +56,8 @@ val serializationVersion: String by project
 
 val kotlin_version: String by project
 
+val androidAttribute = Attribute.of("net.devrieze.android", Boolean::class.javaObjectType)
+
 kotlin {
     targets {
         fromPreset(presets["jvm"], "jvm") {
@@ -80,8 +66,16 @@ kotlin {
                     jvmTarget = "1.8"
                 }
             }
+            attributes.attribute(androidAttribute, false)
+        }
+        fromPreset(presets["jvm"], "android") {
+            attributes.attribute(androidAttribute, true)
+            compilations.all {
+                tasks.getByName<KotlinCompile>(compileKotlinTaskName).kotlinOptions {
+                    jvmTarget = "1.6"
+                }
+            }
         }
-        fromPreset(presets["jvm"], "android") {}
         fromPreset(presets["js"], "js") {
             compilations.all {
                 tasks.getByName<KotlinJsCompile>(compileKotlinTaskName).kotlinOptions {
@@ -183,30 +177,3 @@ extensions.configure<BintrayExtension>("bintray") {
 
 }
 
-
-/*
-
-val jvmSourcesJar = task<Jar>("jvmSourcesJar") {
-    from(sourceSets["jvmMain"].allSource)
-}
-
-val androidSourcesJar = task<Jar>("androidSourcesJar") {
-    from(sourceSets["androidMain"].allSource)
-}
-
-val jsSourcesJar = task<Jar>("jsSourcesJar") {
-    from(sourceSets["jsMain"].allSource)
-}
-
-val commonSourcesJar = task<Jar>("commonSourcesJar") {
-    from(sourceSets["commonMain"].allSource)
-}
-*/
-
-//val sourcesJar = task<Jar>("mySourcesJar") {
-//    from(sourceSets["main"].allSource)
-//}
-
-
-//doPublish(sourcesJar, "xmlutil-common")
-