Update to Kotlin 1.4.0 and move files to submodules

Author: tschuchortdev

.idea/misc.xml

@@ -36,11 +36,9 @@ before_install:
 
 install:
   - ./gradlew assemble --info --no-daemon
-  - ./gradlew -p ksp assemble --info --no-daemon
 
 script:
-  - ./gradlew check --info --no-daemon
-  - ./gradlew -p ksp check --info --no-daemon
+  - ./gradlew --info --no-daemon
 
 notifications:
   email: false

.travis.yml

@@ -17,8 +17,6 @@ build:
 
 build_script:
   - gradlew.bat assemble --info --no-daemon
-  - gradlew.bat -p ksp assemble --info --no-daemon
 
 test_script:
   - gradlew.bat check --info --no-daemon
-  - gradlew.bat -p ksp check --info --no-daemon

appveyor.yml

@@ -3,86 +3,136 @@ buildscript {
 
     repositories {
         mavenCentral()
+        jcenter()
         maven { url 'https://jitpack.io' }
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
+        google()
     }
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
-
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.12.0'
     }
 }
 
 plugins {
-    id 'java'
-    id 'org.jetbrains.kotlin.jvm' version "$kotlin_version"
-    id "com.github.gmazzo.buildconfig" version "2.0.1"
+    id 'io.codearte.nexus-staging' version '0.22.0' //can only be applied to root project
 }
 
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'idea'
-apply plugin: 'maven'
-apply plugin: 'com.vanniktech.maven.publish'
 
-sourceCompatibility = 1.8
+allprojects {
+    group 'com.github.tschuchortdev'
 
-repositories {
-    mavenCentral()
-    maven { url 'https://jitpack.io' }
-    maven { url 'https://kotlin.bintray.com/kotlinx' }
-    jcenter()
-}
+    buildscript {
+        ext.kotlin_version = '1.4.0'
 
-idea {
-    module {
-        sourceDirs += files('build/generated/source/kapt/main', 'build/generated/source/kaptKotlin/main')
-        generatedSourceDirs += files('build/generated/source/kapt/main', 'build/generated/source/kaptKotlin/main')
+        repositories {
+            mavenCentral()
+            jcenter()
+            maven { url 'https://jitpack.io' }
+            maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
+            google()
+        }
     }
-}
 
-buildConfig {
-    className = "BuildConfig"
-    packageName = "com.tschuchort.compiletesting"
-    sourceSets {
-        test {
-            buildConfigField 'String', 'KOTLIN_VERSION', "\"$kotlin_version\""
+    repositories {
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
+        maven { url 'https://kotlin.bintray.com/kotlinx' }
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
+        google()
+        jcenter()
+    }
+
+    apply plugin: 'kotlin'
+    apply plugin: 'java'
+    apply plugin: 'idea'
+    apply plugin: 'maven-publish'
+
+    if (JavaVersion.current().isJava8Compatible()) {
+        tasks.withType(Javadoc) {
+            options.addStringOption('Xdoclint:none', '-quiet')
         }
     }
 }
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
-
-    compileOnly "com.google.auto.service:auto-service:1.0-rc7"
-    kapt "com.google.auto.service:auto-service:1.0-rc7"
+subprojects {
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        //noinspection GroovyAccessibility // alternatively replace this with archiveClassifier.set('...')
+        archiveClassifier = 'sources'
+        from sourceSets.main.allSource, 'build/generated/source/kapt/main', 'build/generated/source/kaptKotlin/main'
+    }
 
-    testImplementation "org.assertj:assertj-core:3.11.1"
-    testImplementation "org.mockito:mockito-core:3.2.4"
-    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        //noinspection GroovyAccessibility //alternatively replace this with archiveClassifier.set('...')
+        archiveClassifier = 'javadoc'
+        from javadoc.destinationDir
+    }
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                pom {
+                    groupId = GROUP
+                    artifactId = POM_ARTIFACT_ID
+                    version = VERSION_NAME
+
+                    name = POM_NAME
+                    packaging = POM_PACKAGING
+                    description = POM_DESCRIPTION
+                    url = POM_URL
+
+                    from components.java
+                    artifact sourcesJar
+                    artifact javadocJar
+
+                    scm {
+                        url = POM_SCM_URL
+                        connection = POM_SCM_CONNECTION
+                        developerConnection = POM_SCM_DEV_CONNECTION
+                    }
+                    licenses {
+                        license {
+                            name = POM_LICENCE_NAME
+                            url = POM_LICENCE_URL
+                            distribution = POM_LICENCE_DIST
+                        }
+                    }
+                    developers {
+                        developer {
+                            id = POM_DEVELOPER_ID
+                            name = POM_DEVELOPER_NAME
+                        }
+                    }
+                }
+            }
+        }
+        repositories {
+            maven {
+                credentials {
+                    username "$System.env.SONATYPE_NEXUS_USERNAME"
+                    password "$System.env.SONATYPE_NEXUS_PASSWORD"
+                }
+                url = VERSION_NAME.endsWith('SNAPSHOT') ? SNAPSHOT_REPOSITORY : RELEASE_REPOSITORY
+            }
+        }
+    }
 
-    testImplementation 'com.squareup:kotlinpoet:1.4.0'
-    testImplementation 'com.squareup:javapoet:1.11.1'
+    dependencies {
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 
-    implementation "com.squareup.okio:okio:2.1.0"
-    implementation 'io.github.classgraph:classgraph:4.8.86'
+        testImplementation group: 'junit', name: 'junit', version: '4.12'
+        testImplementation "org.mockito:mockito-core:3.2.4"
+        testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
+        testImplementation "org.assertj:assertj-core:3.11.1"
+    }
 
-    // This dependency is only needed as a "sample" compiler plugin to test that
-    // running compiler plugins passed via the pluginClasspath CLI option works
-    testRuntime "org.jetbrains.kotlin:kotlin-scripting-compiler:$kotlin_version"
+    sourceCompatibility = 1.8
 
-    // The Kotlin compiler should be near the end of the list because its .jar file includes
-    // an obsolete version of Guava
-    implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:$kotlin_version"
-}
+    compileKotlin {
+        kotlinOptions.jvmTarget = "1.8"
+    }
 
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-    kotlinOptions.freeCompilerArgs += ["-Xskip-runtime-version-check"]
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-    kotlinOptions.freeCompilerArgs += ["-Xskip-runtime-version-check"]
+    compileTestKotlin {
+        kotlinOptions.jvmTarget = "1.8"
+    }
 }

build.gradle

@@ -0,0 +1,47 @@
+
+plugins {
+    id "com.github.gmazzo.buildconfig" version "2.0.1"
+}
+
+apply plugin: 'kotlin-kapt'
+
+
+
+buildConfig {
+    className = "BuildConfig"
+    packageName = "com.tschuchort.compiletesting"
+    sourceSets {
+        test {
+            buildConfigField 'String', 'KOTLIN_VERSION', "\"$kotlin_version\""
+        }
+    }
+}
+
+dependencies {
+    compileOnly "com.google.auto.service:auto-service:1.0-rc7"
+    kapt "com.google.auto.service:auto-service:1.0-rc7"
+
+
+    testImplementation 'com.squareup:kotlinpoet:1.4.0'
+    testImplementation 'com.squareup:javapoet:1.11.1'
+
+    implementation "com.squareup.okio:okio:2.1.0"
+    implementation 'io.github.classgraph:classgraph:4.8.86'
+
+    // This dependency is only needed as a "sample" compiler plugin to test that
+    // running compiler plugins passed via the pluginClasspath CLI option works
+    testRuntime "org.jetbrains.kotlin:kotlin-scripting-compiler:$kotlin_version"
+
+    // The Kotlin compiler should be near the end of the list because its .jar file includes
+    // an obsolete version of Guava
+    implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:$kotlin_version"
+}
+
+compileKotlin {
+    kotlinOptions.freeCompilerArgs += ["-Xskip-runtime-version-check"]
+}
+
+compileTestKotlin {
+    kotlinOptions.freeCompilerArgs += ["-Xskip-runtime-version-check"]
+}

core/build.gradle

@@ -0,0 +1 @@
+POM_ARTIFACT_ID=kotlin-compile-testing

core/gradle.properties

@@ -2,7 +2,7 @@ kotlin.code.style=official
 kotlin.incremental=false
 
 GROUP=com.github.tschuchortdev
-VERSION_NAME=1.2.8
+VERSION_NAME=1.2.10
 POM_DESCRIPTION=A library that enables testing of Kotlin annotation processors, compiler plugins and code generation.
 POM_INCEPTION_YEAR=2019
 POM_URL=https://github.com/tschuchortdev/kotlin-compile-testing
@@ -14,6 +14,7 @@ POM_LICENCE_URL=https://www.mozilla.org/en-US/MPL/2.0/
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=tschuchortdev
 POM_DEVELOPER_NAME=Thilo Schuchort
-POM_ARTIFACT_ID=kotlin-compile-testing
 POM_NAME=kotlin-compile-testing
-POM_PACKAGING=jar
+POM_PACKAGING=jar
+RELEASE_REPOSITORY=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+SNAPSHOT_REPOSITORY=https://oss.sonatype.org/content/repositories/snapshots/

src/main/kotlin/SynchronizedToolProvider.kt core/src/main/kotlin/SynchronizedToolProvider.kt

@@ -1,62 +1,12 @@
+
 buildscript {
-    ext.kotlin_version = '1.4.0-rc'
     ext.ksp_version='1.4.0-rc-dev-experimental-20200731'
-    // copy properties from the main project's properties file
-    def mainProjectProperties = new File(
-            gradle.includedBuild("kotlin-compile-testing").projectDir,
-            "gradle.properties"
-    )
-    def props = new Properties()
-    mainProjectProperties.newInputStream().withStream {
-        props.load(it)
-    }
-    props.forEach { key, value ->
-        rootProject.extensions.putAt(key, value)
-    }
-    repositories {
-        mavenCentral()
-        jcenter()
-        maven { url 'https://jitpack.io' }
-        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
-    }
-}
-apply plugin: 'kotlin'
-apply plugin: 'maven'
-apply plugin: 'com.vanniktech.maven.publish'
-
-group 'com.github.tschuchortdev'
-
-repositories {
-    mavenCentral()
-    maven { url 'https://jitpack.io' }
-    maven { url 'https://kotlin.bintray.com/kotlinx' }
-    jcenter()
-    maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
-    google()
 }
 
 dependencies {
-    // We do not specify a version here because `kotlin-compile-testing` is an included build and gradle will use the
-    // main module of the main project as the dependency.
-    api("com.github.tschuchortdev:kotlin-compile-testing:$VERSION_NAME")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    api project(':core')
     implementation "org.jetbrains.kotlin:kotlin-symbol-processing-api:$ksp_version"
     implementation "org.jetbrains.kotlin:kotlin-ksp:$ksp_version"
     implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlin_version"
-
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
-    testImplementation "org.assertj:assertj-core:3.11.1"
-    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
 }
 
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}