From 49292cd26c4825dfa08b4d4191969024e0040d53 Mon Sep 17 00:00:00 2001 From: Lucas Smaira Date: Mon, 30 Jul 2018 12:18:04 +0100 Subject: [PATCH] Move model interfaces code from Java to Kotlin --- .../allopen/gradle/model/impl/AllOpenImpl.kt | 22 ++------- .../kotlin-gradle-plugin-model/build.gradle | 2 +- .../jetbrains/kotlin/gradle/model/AllOpen.kt} | 21 +++----- .../kotlin/gradle/model/CompilerArguments.kt} | 20 +++----- .../gradle/model/ExperimentalFeatures.kt} | 11 ++--- .../jetbrains/kotlin/gradle/model/Kapt.kt} | 18 +++---- .../kotlin/gradle/model/KaptSourceSet.kt} | 27 ++++------- .../gradle/model/KotlinAndroidExtension.kt} | 19 +++----- .../kotlin/gradle/model/KotlinProject.kt} | 38 ++++++--------- .../jetbrains/kotlin/gradle/model/NoArg.kt} | 23 ++++----- .../kotlin/gradle/model/SamWithReceiver.kt} | 21 +++----- .../kotlin/gradle/model/SourceSet.kt} | 37 +++++--------- .../model/impl/CompilerArgumentsImpl.kt | 18 ++----- .../model/impl/ExperimentalFeaturesImpl.kt | 6 +-- .../kotlin/gradle/model/impl/KaptImpl.kt | 16 ++----- .../gradle/model/impl/KaptSourceSetImpl.kt | 30 +++--------- .../model/impl/KotlinAndroidExtensionImpl.kt | 22 ++------- .../gradle/model/impl/KotlinProjectImpl.kt | 40 +++------------- .../kotlin/gradle/model/impl/SourceSetImpl.kt | 48 ++++--------------- .../noarg/gradle/model/impl/NoArgImpl.kt | 28 ++--------- .../gradle/model/impl/SamWithReceiverImpl.kt | 22 ++------- 21 files changed, 130 insertions(+), 359 deletions(-) rename libraries/tools/kotlin-gradle-plugin-model/src/main/{java/org/jetbrains/kotlin/gradle/model/AllOpen.java => kotlin/org/jetbrains/kotlin/gradle/model/AllOpen.kt} (72%) rename libraries/tools/kotlin-gradle-plugin-model/src/main/{java/org/jetbrains/kotlin/gradle/model/CompilerArguments.java => kotlin/org/jetbrains/kotlin/gradle/model/CompilerArguments.kt} (68%) rename libraries/tools/kotlin-gradle-plugin-model/src/main/{java/org/jetbrains/kotlin/gradle/model/ExperimentalFeatures.java => kotlin/org/jetbrains/kotlin/gradle/model/ExperimentalFeatures.kt} (67%) rename libraries/tools/kotlin-gradle-plugin-model/src/main/{java/org/jetbrains/kotlin/gradle/model/Kapt.java => kotlin/org/jetbrains/kotlin/gradle/model/Kapt.kt} (70%) rename libraries/tools/kotlin-gradle-plugin-model/src/main/{java/org/jetbrains/kotlin/gradle/model/KaptSourceSet.java => kotlin/org/jetbrains/kotlin/gradle/model/KaptSourceSet.kt} (68%) rename libraries/tools/kotlin-gradle-plugin-model/src/main/{java/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtension.java => kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtension.kt} (72%) rename libraries/tools/kotlin-gradle-plugin-model/src/main/{java/org/jetbrains/kotlin/gradle/model/KotlinProject.java => kotlin/org/jetbrains/kotlin/gradle/model/KotlinProject.kt} (74%) rename libraries/tools/kotlin-gradle-plugin-model/src/main/{java/org/jetbrains/kotlin/gradle/model/NoArg.java => kotlin/org/jetbrains/kotlin/gradle/model/NoArg.kt} (73%) rename libraries/tools/kotlin-gradle-plugin-model/src/main/{java/org/jetbrains/kotlin/gradle/model/SamWithReceiver.java => kotlin/org/jetbrains/kotlin/gradle/model/SamWithReceiver.kt} (72%) rename libraries/tools/kotlin-gradle-plugin-model/src/main/{java/org/jetbrains/kotlin/gradle/model/SourceSet.java => kotlin/org/jetbrains/kotlin/gradle/model/SourceSet.kt} (67%) diff --git a/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/model/impl/AllOpenImpl.kt b/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/model/impl/AllOpenImpl.kt index 86590a1d45f..25b6eff1eb7 100644 --- a/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/model/impl/AllOpenImpl.kt +++ b/libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/model/impl/AllOpenImpl.kt @@ -12,26 +12,12 @@ import java.io.Serializable * Implementation of the [AllOpen] interface. */ data class AllOpenImpl( - private val myName: String, - private val myAnnotations: List, - private val myPresets: List + override val name: String, + override val annotations: List, + override val presets: List ) : AllOpen, Serializable { - override fun getModelVersion(): Long { - return serialVersionUID - } - - override fun getName(): String { - return myName - } - - override fun getAnnotations(): List { - return myAnnotations - } - - override fun getPresets(): List { - return myPresets - } + override val modelVersion = serialVersionUID companion object { private const val serialVersionUID = 1L diff --git a/libraries/tools/kotlin-gradle-plugin-model/build.gradle b/libraries/tools/kotlin-gradle-plugin-model/build.gradle index 146ec471a88..4b6a6003aa1 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-model/build.gradle @@ -8,7 +8,7 @@ repositories { } dependencies { - compile "org.jetbrains:annotations:13.0" + compile project(':kotlin-stdlib') } artifacts { diff --git a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/AllOpen.java b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/AllOpen.kt similarity index 72% rename from libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/AllOpen.java rename to libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/AllOpen.kt index 94021e04d6c..a25fb8301af 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/AllOpen.java +++ b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/AllOpen.kt @@ -3,17 +3,13 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.model; - -import org.jetbrains.annotations.NotNull; - -import java.util.List; +package org.jetbrains.kotlin.gradle.model /** * Entry point for Kotlin All Open models. * Represents the description of annotations interpreted by 'kotlin-allopen' plugin. */ -public interface AllOpen { +interface AllOpen { /** * Return a number representing the version of this API. @@ -21,29 +17,26 @@ public interface AllOpen { * * @return the version of this model. */ - long getModelVersion(); + val modelVersion: Long /** * Returns the module (Gradle project) name. * * @return the module name. */ - @NotNull - String getName(); + val name: String /** * Return the list of annotations. * * @return the list of annotations. */ - @NotNull - List getAnnotations(); + val annotations: List /** * Return the list of presets. * * @return the list of presets. */ - @NotNull - List getPresets(); -} + val presets: List +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/CompilerArguments.java b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/CompilerArguments.kt similarity index 68% rename from libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/CompilerArguments.java rename to libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/CompilerArguments.kt index c5108e66cb6..5d67a0c6810 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/CompilerArguments.java +++ b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/CompilerArguments.kt @@ -3,40 +3,34 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.model; +package org.jetbrains.kotlin.gradle.model -import org.jetbrains.annotations.NotNull; - -import java.io.File; -import java.util.List; +import java.io.File /** * Represents the compiler arguments for a given Kotlin source set. * @see SourceSet */ -public interface CompilerArguments { +interface CompilerArguments { /** * Return current arguments for the given source set. * * @return current arguments for the given source set. */ - @NotNull - List getCurrentArguments(); + val currentArguments: List /** * Return default arguments for the given source set. * * @return default arguments for the given source set. */ - @NotNull - List getDefaultArguments(); + val defaultArguments: List /** * Return the classpath the given source set is compiled against. * * @return the classpath the given source set is compiled against. */ - @NotNull - List getCompileClasspath(); -} + val compileClasspath: List +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/ExperimentalFeatures.java b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/ExperimentalFeatures.kt similarity index 67% rename from libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/ExperimentalFeatures.java rename to libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/ExperimentalFeatures.kt index 85d023f88b2..19b56bcf4e3 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/ExperimentalFeatures.java +++ b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/ExperimentalFeatures.kt @@ -3,21 +3,18 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.model; - -import org.jetbrains.annotations.Nullable; +package org.jetbrains.kotlin.gradle.model /** * Wraps all experimental features information for a given Kotlin project. * @see KotlinProject */ -public interface ExperimentalFeatures { +interface ExperimentalFeatures { /** * Return coroutines string. * * @return coroutines. */ - @Nullable - String getCoroutines(); -} + val coroutines: String? +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/Kapt.java b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/Kapt.kt similarity index 70% rename from libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/Kapt.java rename to libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/Kapt.kt index 568dc8bcfd1..9e752168a22 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/Kapt.java +++ b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/Kapt.kt @@ -3,17 +3,13 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.model; - -import org.jetbrains.annotations.NotNull; - -import java.util.Collection; +package org.jetbrains.kotlin.gradle.model /** * Entry point for annotation processor model. * Plugin 'kotlin-kapt' can produce this model. */ -public interface Kapt { +interface Kapt { /** * Return a number representing the version of this API. @@ -21,21 +17,19 @@ public interface Kapt { * * @return the version of this model. */ - long getModelVersion(); + val modelVersion: Long /** * Returns the module (Gradle project) name. * * @return the module name. */ - @NotNull - String getName(); + val name: String /** * Return all kapt source sets. * * @return all kapt source sets. */ - @NotNull - Collection getKaptSourceSets(); -} + val kaptSourceSets: Collection +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/KaptSourceSet.java b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/KaptSourceSet.kt similarity index 68% rename from libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/KaptSourceSet.java rename to libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/KaptSourceSet.kt index 5fc85db60bb..7a19db83d8f 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/KaptSourceSet.java +++ b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/KaptSourceSet.kt @@ -3,22 +3,20 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.model; +package org.jetbrains.kotlin.gradle.model -import org.jetbrains.annotations.NotNull; - -import java.io.File; +import java.io.File /** * Represents a source set for a given kapt model. * @see Kapt */ -public interface KaptSourceSet { +interface KaptSourceSet { /** * Possible source set types. */ - enum KaptSourceSetType { + enum class KaptSourceSetType { PRODUCTION, TEST } @@ -28,38 +26,33 @@ public interface KaptSourceSet { * * @return the source set name. */ - @NotNull - String getName(); + val name: String /** * Return the type of the source set. * * @return the type of the source set. */ - @NotNull - KaptSourceSetType getType(); + val type: KaptSourceSetType /** * Return generated sources directory. * * @return generated sources directory. */ - @NotNull - File getGeneratedSourcesDirectory(); + val generatedSourcesDirectory: File /** * Return Kotlin generated sources directory. * * @return Kotlin generated sources directory. */ - @NotNull - File getGeneratedKotlinSourcesDirectory(); + val generatedKotlinSourcesDirectory: File /** * Return Kotlin generated classes directory. * * @return Kotlin generated classes directory. */ - @NotNull - File getGeneratedClassesDirectory(); -} + val generatedClassesDirectory: File +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtension.java b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtension.kt similarity index 72% rename from libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtension.java rename to libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtension.kt index baf34a29418..ee155516ea8 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtension.java +++ b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtension.kt @@ -3,16 +3,13 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.model; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +package org.jetbrains.kotlin.gradle.model /** * Entry point for Kotlin Android Extensions models. * Represents the description of Android only features. Provided by 'kotlin-android-extensions' plugin. */ -public interface KotlinAndroidExtension { +interface KotlinAndroidExtension { /** * Return a number representing the version of this API. @@ -20,28 +17,26 @@ public interface KotlinAndroidExtension { * * @return the version of this model. */ - long getModelVersion(); + val modelVersion: Long /** * Returns the module (Gradle project) name. * * @return the module name. */ - @NotNull - String getName(); + val name: String /** * Indicate the use of experimental features. * * @return if experimental features are used. */ - boolean isExperimental(); + val isExperimental: Boolean /** * Return the default cache implementation. * * @return the default cache implementation. */ - @Nullable - String getDefaultCacheImplementation(); -} + val defaultCacheImplementation: String? +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/KotlinProject.java b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProject.kt similarity index 74% rename from libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/KotlinProject.java rename to libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProject.kt index b94c630b071..900818ed9d1 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/KotlinProject.java +++ b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProject.kt @@ -3,30 +3,26 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.model; - -import org.jetbrains.annotations.NotNull; - -import java.util.Collection; +package org.jetbrains.kotlin.gradle.model /** * Entry point for the model of Kotlin Projects. * Plugins 'kotlin', 'kotlin-platform-jvm', 'kotlin2js', 'kotlin-platform-js' and 'kotlin-platform-common' can produce this model. */ -public interface KotlinProject { +interface KotlinProject { /** * Possible Kotlin project types. */ - enum ProjectType { + enum class ProjectType { - /** Indicator of platform plugin id 'kotlin-platform-jvm' or 'kotlin'. */ + /** Indicator of platform plugin id 'kotlin-platform-jvm' or 'kotlin'. */ PLATFORM_JVM, - /** Indicator of platform plugin id 'kotlin-platform-js' or 'kotlin2js'. */ + /** Indicator of platform plugin id 'kotlin-platform-js' or 'kotlin2js'. */ PLATFORM_JS, - /** Indicator of platform plugin id 'kotlin-platform-common'. */ + /** Indicator of platform plugin id 'kotlin-platform-common'. */ PLATFORM_COMMON } @@ -36,53 +32,47 @@ public interface KotlinProject { * * @return the version of this model. */ - long getModelVersion(); + val modelVersion: Long /** * Returns the module (Gradle project) name. * * @return the module name. */ - @NotNull - String getName(); + val name: String /** * Return the Kotlin version. * * @return the Kotlin version. */ - @NotNull - String getKotlinVersion(); + val kotlinVersion: String /** * Return the type of the platform plugin applied. * * @return the type of the platform plugin applied. Possible values are defined in the enum. */ - @NotNull - ProjectType getProjectType(); + val projectType: ProjectType /** * Return all source sets used by Kotlin. * * @return all source sets. */ - @NotNull - Collection getSourceSets(); + val sourceSets: Collection /** * Return all modules (Gradle projects) registered as 'expectedBy' dependency. * * @return expectedBy dependencies. */ - @NotNull - Collection getExpectedByDependencies(); + val expectedByDependencies: Collection /** * Return an object containing a descriptor of the experimental features. * * @return experimental features. */ - @NotNull - ExperimentalFeatures getExperimentalFeatures(); -} + val experimentalFeatures: ExperimentalFeatures +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/NoArg.java b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/NoArg.kt similarity index 73% rename from libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/NoArg.java rename to libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/NoArg.kt index dd49d1d97b8..0f3fb983cf0 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/NoArg.java +++ b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/NoArg.kt @@ -3,17 +3,13 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.model; - -import org.jetbrains.annotations.NotNull; - -import java.util.List; +package org.jetbrains.kotlin.gradle.model /** * Entry point for Kotlin No Arg models. * Represents the description of annotations interpreted by 'kotlin-noarg' plugin. */ -public interface NoArg { +interface NoArg { /** * Return a number representing the version of this API. @@ -21,31 +17,28 @@ public interface NoArg { * * @return the version of this model. */ - long getModelVersion(); + val modelVersion: Long /** * Returns the module (Gradle project) name. * * @return the module name. */ - @NotNull - String getName(); + val name: String /** * Return the list of annotations. * * @return the list of annotations. */ - @NotNull - List getAnnotations(); + val annotations: List /** * Return the list of presets. * * @return the list of presets. */ - @NotNull - List getPresets(); + val presets: List /** * Return if should invoke initializers. @@ -53,5 +46,5 @@ public interface NoArg { * * @return if initializers should be invoked. */ - boolean isInvokeInitializers(); -} + val isInvokeInitializers: Boolean +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/SamWithReceiver.java b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/SamWithReceiver.kt similarity index 72% rename from libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/SamWithReceiver.java rename to libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/SamWithReceiver.kt index 03799106aa7..189373efc93 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/SamWithReceiver.java +++ b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/SamWithReceiver.kt @@ -3,17 +3,13 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.model; - -import org.jetbrains.annotations.NotNull; - -import java.util.List; +package org.jetbrains.kotlin.gradle.model /** * Entry point for Kotlin Sam With Receiver models. * Represents the description of annotations interpreted by 'kotlin-sam-with-receiver' plugin. */ -public interface SamWithReceiver { +interface SamWithReceiver { /** * Return a number representing the version of this API. @@ -21,29 +17,26 @@ public interface SamWithReceiver { * * @return the version of this model. */ - long getModelVersion(); + val modelVersion: Long /** * Returns the module (Gradle project) name. * * @return the module name. */ - @NotNull - String getName(); + val name: String /** * Return the list of annotations. * * @return the list of annotations. */ - @NotNull - List getAnnotations(); + val annotations: List /** * Return the list of presets. * * @return the list of presets. */ - @NotNull - List getPresets(); -} + val presets: List +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/SourceSet.java b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/SourceSet.kt similarity index 67% rename from libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/SourceSet.java rename to libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/SourceSet.kt index a8f3ae15fd7..692c23030d3 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/src/main/java/org/jetbrains/kotlin/gradle/model/SourceSet.java +++ b/libraries/tools/kotlin-gradle-plugin-model/src/main/kotlin/org/jetbrains/kotlin/gradle/model/SourceSet.kt @@ -3,23 +3,20 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.model; +package org.jetbrains.kotlin.gradle.model -import org.jetbrains.annotations.NotNull; - -import java.io.File; -import java.util.Collection; +import java.io.File /** * Represents a source set for a given Kotlin Gradle project. * @see KotlinProject */ -public interface SourceSet { +interface SourceSet { /** * Possible source set types. */ - enum SourceSetType { + enum class SourceSetType { PRODUCTION, TEST } @@ -29,62 +26,54 @@ public interface SourceSet { * * @return the source set name. */ - @NotNull - String getName(); + val name: String /** * Return the type of the source set. * * @return the type of the source set. */ - @NotNull - SourceSetType getType(); + val type: SourceSetType /** * Return the names of all friend source sets. * * @return friend source sets. */ - @NotNull - Collection getFriendSourceSets(); + val friendSourceSets: Collection /** * Return all Kotlin sources directories. * * @return all Kotlin sources directories. */ - @NotNull - Collection getSourceDirectories(); + val sourceDirectories: Collection /** * Return all Kotlin resources directories. * * @return all Kotlin resources directories. */ - @NotNull - Collection getResourcesDirectories(); + val resourcesDirectories: Collection /** * Return the classes output directory. * * @return the classes output directory. */ - @NotNull - File getClassesOutputDirectory(); + val classesOutputDirectory: File /** * Return the resources output directory. * * @return the resources output directory. */ - @NotNull - File getResourcesOutputDirectory(); + val resourcesOutputDirectory: File /** * Return an object containing all compiler arguments for this source set. * * @return compiler arguments for this source set. */ - @NotNull - CompilerArguments getCompilerArguments(); -} + val compilerArguments: CompilerArguments +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/CompilerArgumentsImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/CompilerArgumentsImpl.kt index bfc0b1d6fa3..db5a2620dac 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/CompilerArgumentsImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/CompilerArgumentsImpl.kt @@ -13,23 +13,11 @@ import java.io.Serializable * Implementation of the [CompilerArguments] interface. */ data class CompilerArgumentsImpl( - private val myCurrentArguments: List, - private val myDefaultArguments: List, - private val myCompilerClasspath: List + override val currentArguments: List, + override val defaultArguments: List, + override val compileClasspath: List ) : CompilerArguments, Serializable { - override fun getCurrentArguments(): List { - return myCurrentArguments - } - - override fun getDefaultArguments(): List { - return myDefaultArguments - } - - override fun getCompileClasspath(): List { - return myCompilerClasspath - } - companion object { private const val serialVersionUID = 1L } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/ExperimentalFeaturesImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/ExperimentalFeaturesImpl.kt index cb0f114fade..ea104648067 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/ExperimentalFeaturesImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/ExperimentalFeaturesImpl.kt @@ -12,13 +12,9 @@ import java.io.Serializable * Implementation of the [ExperimentalFeatures] interface. */ data class ExperimentalFeaturesImpl( - private val myCoroutines: String? + override val coroutines: String? ) : ExperimentalFeatures, Serializable { - override fun getCoroutines(): String? { - return myCoroutines - } - companion object { private const val serialVersionUID = 1L } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KaptImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KaptImpl.kt index 44e55a82b05..8a6e2869ad3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KaptImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KaptImpl.kt @@ -13,21 +13,11 @@ import java.io.Serializable * Implementation of the [Kapt] interface. */ data class KaptImpl( - private val myName: String, - private val kaptSourceSets: Collection + override val name: String, + override val kaptSourceSets: Collection ) : Kapt, Serializable { - override fun getModelVersion(): Long { - return serialVersionUID - } - - override fun getName(): String { - return myName - } - - override fun getKaptSourceSets(): Collection { - return kaptSourceSets - } + override val modelVersion = serialVersionUID companion object { private const val serialVersionUID = 1L diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KaptSourceSetImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KaptSourceSetImpl.kt index 9bca3bbf468..2ab2d68f114 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KaptSourceSetImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KaptSourceSetImpl.kt @@ -13,30 +13,14 @@ import java.io.Serializable * Implementation of the [KaptSourceSet] interface. */ data class KaptSourceSetImpl( - private val myName: String, - private val myType: KaptSourceSet.KaptSourceSetType, - private val myGeneratedSourcesDirectory: File, - private val myGeneratedKotlinSourcesDirectory: File, - private val myGeneratedClassesDirectory: File + override val name: String, + override val type: KaptSourceSet.KaptSourceSetType, + override val generatedSourcesDirectory: File, + override val generatedKotlinSourcesDirectory: File, + override val generatedClassesDirectory: File ) : KaptSourceSet, Serializable { - override fun getName(): String { - return myName - } - - override fun getType(): KaptSourceSet.KaptSourceSetType { - return myType - } - - override fun getGeneratedSourcesDirectory(): File { - return myGeneratedSourcesDirectory - } - - override fun getGeneratedKotlinSourcesDirectory(): File { - return myGeneratedKotlinSourcesDirectory - } - - override fun getGeneratedClassesDirectory(): File { - return myGeneratedClassesDirectory + companion object { + private const val serialVersionUID = 1L } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KotlinAndroidExtensionImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KotlinAndroidExtensionImpl.kt index 6efd942bb6e..f1344df7d7b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KotlinAndroidExtensionImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KotlinAndroidExtensionImpl.kt @@ -12,26 +12,12 @@ import java.io.Serializable * Implementation of the [KotlinAndroidExtension] interface. */ data class KotlinAndroidExtensionImpl( - private val myName: String, - private val myIsExperimental: Boolean, - private val myDefaultCacheImplementation: String? + override val name: String, + override val isExperimental: Boolean, + override val defaultCacheImplementation: String? ) : KotlinAndroidExtension, Serializable { - override fun getModelVersion(): Long { - return serialVersionUID - } - - override fun getName(): String { - return myName - } - - override fun isExperimental(): Boolean { - return myIsExperimental - } - - override fun getDefaultCacheImplementation(): String? { - return myDefaultCacheImplementation - } + override val modelVersion = serialVersionUID companion object { private const val serialVersionUID = 1L diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KotlinProjectImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KotlinProjectImpl.kt index 4995020c9d3..d3e44be3e2a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KotlinProjectImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/KotlinProjectImpl.kt @@ -14,41 +14,15 @@ import java.io.Serializable * Implementation of the [KotlinProject] interface. */ data class KotlinProjectImpl( - private val myName: String, - private val myKotlinVersion: String, - private val myProjectType: KotlinProject.ProjectType, - private val mySourceSets: Collection, - private val myExpectedByDependencies: Collection, - private val myExperimentalFeatures: ExperimentalFeatures + override val name: String, + override val kotlinVersion: String, + override val projectType: KotlinProject.ProjectType, + override val sourceSets: Collection, + override val expectedByDependencies: Collection, + override val experimentalFeatures: ExperimentalFeatures ) : KotlinProject, Serializable { - override fun getModelVersion(): Long { - return serialVersionUID - } - - override fun getName(): String { - return myName - } - - override fun getKotlinVersion(): String { - return myKotlinVersion - } - - override fun getProjectType(): KotlinProject.ProjectType { - return myProjectType - } - - override fun getSourceSets(): Collection { - return mySourceSets - } - - override fun getExpectedByDependencies(): Collection { - return myExpectedByDependencies - } - - override fun getExperimentalFeatures(): ExperimentalFeatures { - return myExperimentalFeatures - } + override val modelVersion = serialVersionUID companion object { private const val serialVersionUID = 1L diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/SourceSetImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/SourceSetImpl.kt index 4fb9a034f59..0ce4c3c418e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/SourceSetImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/impl/SourceSetImpl.kt @@ -14,48 +14,16 @@ import java.io.Serializable * Implementation of the [SourceSet] interface. */ data class SourceSetImpl( - private val myName: String, - private val myType: SourceSet.SourceSetType, - private val myFriendSourceSets: Collection, - private val mySourceDirectories: Collection, - private val myResourcesDirectories: Collection, - private val myClassesOutputDirectory: File, - private val myResourcesOutputDirectory: File, - private val myCompilerArguments: CompilerArguments + override val name: String, + override val type: SourceSet.SourceSetType, + override val friendSourceSets: Collection, + override val sourceDirectories: Collection, + override val resourcesDirectories: Collection, + override val classesOutputDirectory: File, + override val resourcesOutputDirectory: File, + override val compilerArguments: CompilerArguments ) : SourceSet, Serializable { - override fun getName(): String { - return myName - } - - override fun getType(): SourceSet.SourceSetType { - return myType - } - - override fun getFriendSourceSets(): Collection { - return myFriendSourceSets - } - - override fun getSourceDirectories(): Collection { - return mySourceDirectories - } - - override fun getResourcesDirectories(): Collection { - return myResourcesDirectories - } - - override fun getClassesOutputDirectory(): File { - return myClassesOutputDirectory - } - - override fun getResourcesOutputDirectory(): File { - return myResourcesOutputDirectory - } - - override fun getCompilerArguments(): CompilerArguments { - return myCompilerArguments - } - companion object { private const val serialVersionUID = 1L } diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt b/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt index 22d02d46aef..90676a52f28 100644 --- a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt +++ b/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt @@ -12,31 +12,13 @@ import java.io.Serializable * Implementation of the [NoArg] interface. */ data class NoArgImpl( - private val myName: String, - private val myAnnotations: List, - private val myPresets: List, - private val myInvokeInitializers: Boolean + override val name: String, + override val annotations: List, + override val presets: List, + override val isInvokeInitializers: Boolean ) : NoArg, Serializable { - override fun getModelVersion(): Long { - return serialVersionUID - } - - override fun getName(): String { - return myName - } - - override fun getAnnotations(): List { - return myAnnotations - } - - override fun getPresets(): List { - return myPresets - } - - override fun isInvokeInitializers(): Boolean { - return myInvokeInitializers - } + override val modelVersion = serialVersionUID companion object { private const val serialVersionUID = 1L diff --git a/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/SamWithReceiverImpl.kt b/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/SamWithReceiverImpl.kt index 3f3ef50a3e4..a12ea700490 100644 --- a/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/SamWithReceiverImpl.kt +++ b/libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/SamWithReceiverImpl.kt @@ -12,26 +12,12 @@ import java.io.Serializable * Implementation of the [SamWithReceiver] interface. */ data class SamWithReceiverImpl( - private val myName: String, - private val myAnnotations: List, - private val myPresets: List + override val name: String, + override val annotations: List, + override val presets: List ) : SamWithReceiver, Serializable { - override fun getModelVersion(): Long { - return serialVersionUID - } - - override fun getName(): String { - return myName - } - - override fun getAnnotations(): List { - return myAnnotations - } - - override fun getPresets(): List { - return myPresets - } + override val modelVersion = serialVersionUID companion object { private const val serialVersionUID = 1L