Bumped Kotlin to 1.5, Gradle to 7.0, maven-publish-plugin to 0.15.1 a…

…nd kotlin-compile-testing to 1.4.0

gradle.properties

@@ -1,3 +1,3 @@
-kotlin_version=1.4.32
+kotlin_version=1.5.0
 android.enableJetifier=true
 android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed May 27 08:55:23 EET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

plugins/compiler-plugin/build.gradle

@@ -10,7 +10,6 @@ repositories {
 
 tasks.withType(KotlinCompile).all {
     kotlinOptions {
-        jvmTarget = "1.8"
         freeCompilerArgs = ['-progressive', '-Xjvm-default=all']
     }
 }
@@ -31,7 +30,7 @@ dependencies {
     api project(":core")
 
     testImplementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlin_version"
-    testImplementation "com.github.tschuchortdev:kotlin-compile-testing:1.2.10"
+    testImplementation "com.github.tschuchortdev:kotlin-compile-testing:1.4.0"
     testImplementation "junit:junit:4.13"
     testImplementation "com.google.truth:truth:1.0.1"
     testImplementation project(":annotations")

plugins/gradle-plugin/build.gradle

@@ -44,12 +44,6 @@ pluginBundle {
     }
 }
 
-tasks.withType(KotlinCompile).all {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
 jar {
     manifest {
         attributes["Specification-Title"] = project.name

plugins/gradle.properties

@@ -1,5 +1,5 @@
-kotlin_version=1.4.32
-maven_publish_plugin_version=0.11.1
+kotlin_version=1.5.0
+maven_publish_plugin_version=0.15.1
 kapt.includeCompileClasspath=false
 GROUP=dev.ahmedmourad.nocopy
 VERSION_NAME=1.3.0

plugins/idea-plugin/build.gradle

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id "org.jetbrains.intellij" version "0.4.16"
+    id "org.jetbrains.intellij" version "0.7.3"
     id "org.jetbrains.kotlin.jvm"
 }
 
@@ -18,19 +18,19 @@ tasks.withType(KotlinCompile).all {
     }
 }
 
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0"
+    implementation project(":compiler-plugin")
+}
+
 jar {
     manifest {
         attributes["Specification-Title"] = project.name
         attributes["Specification-Version"] = project.version
         attributes["Implementation-Title"] = "dev.ahmedmourad.nocopy.nocopy-idea-plugin"
         attributes["Implementation-Version"] = project.version
     }
-    from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32"
-    implementation project(":compiler-plugin")
+    from configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
 }
 
 intellij {

sample/build.gradle

@@ -9,6 +9,6 @@ repositories {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.32"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.0"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0"
 }