Skip to content

Commit a78e9e9

Browse files
alexanderpannalexanderpann
committed
fix some small issues
1 parent f1d5f21 commit a78e9e9

File tree

3 files changed

+123
-63
lines changed

3 files changed

+123
-63
lines changed

‎api/mps-gradle-plugin.api

+110-58
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,32 @@ public class de/itemis/mps/gradle/BuildLanguages : de/itemis/mps/gradle/RunAntSc
3030
public fun <init> ()V
3131
}
3232

33-
public class de/itemis/mps/gradle/BundleMacosJdk : org/gradle/api/DefaultTask, groovy/lang/GroovyObject {
34-
public static synthetic field __$stMC Z
35-
protected synthetic fun $getStaticMetaClass ()Lgroovy/lang/MetaClass;
33+
public class de/itemis/mps/gradle/BundleMacosJdk : org/gradle/api/DefaultTask {
34+
public field jdk Ljava/io/File;
35+
public field outputFile Ljava/io/File;
36+
public field rcpArtifact Ljava/io/File;
3637
public fun <init> ()V
37-
public fun build ()Ljava/lang/Object;
38-
public fun getJdk ()Ljava/io/File;
39-
public fun getJdkDirname ()Ljava/lang/String;
40-
public fun getMetaClass ()Lgroovy/lang/MetaClass;
41-
public fun getOutputFile ()Ljava/io/File;
42-
public fun getRcpArtifact ()Ljava/io/File;
43-
public fun setJdk (Ljava/lang/Object;)Ljava/lang/Object;
44-
public fun setJdkDependency (Ljava/lang/Object;)Ljava/lang/Object;
45-
public fun setJdkDirname (Ljava/lang/String;)Ljava/lang/Object;
46-
public fun setMetaClass (Lgroovy/lang/MetaClass;)V
47-
public fun setOutputFile (Ljava/lang/Object;)Ljava/lang/Object;
48-
public fun setRcpArtifact (Ljava/lang/Object;)Ljava/lang/Object;
38+
public final fun build ()V
39+
public final fun getJdk ()Ljava/io/File;
40+
public final fun getJdkDirname ()Ljava/lang/String;
41+
public final fun getOutputFile ()Ljava/io/File;
42+
public final fun getRcpArtifact ()Ljava/io/File;
43+
public final fun setJdk (Ljava/io/File;)V
44+
public final fun setJdkDependency (Ljava/lang/Object;)V
45+
public final fun setJdkDirname (Ljava/lang/String;)V
46+
public final fun setOutputFile (Ljava/io/File;)V
47+
public final fun setOutputFile (Ljava/lang/Object;)V
48+
public final fun setRcpArtifact (Ljava/io/File;)V
49+
}
50+
51+
public final class de/itemis/mps/gradle/BundledScripts {
52+
public static final field Companion Lde/itemis/mps/gradle/BundledScripts$Companion;
53+
public fun <init> ()V
54+
public static final fun extractScriptsToDir (Ljava/io/File;[Ljava/lang/String;)V
4955
}
5056

51-
public class de/itemis/mps/gradle/BundledScripts : groovy/lang/GroovyObject {
52-
public static synthetic field __$stMC Z
53-
protected synthetic fun $getStaticMetaClass ()Lgroovy/lang/MetaClass;
54-
public fun <init> ()V
55-
public static fun extractScriptsToDir (Ljava/io/File;[Ljava/lang/String;)V
56-
public fun getMetaClass ()Lgroovy/lang/MetaClass;
57-
public fun setMetaClass (Lgroovy/lang/MetaClass;)V
57+
public final class de/itemis/mps/gradle/BundledScripts$Companion {
58+
public final fun extractScriptsToDir (Ljava/io/File;[Ljava/lang/String;)V
5859
}
5960

6061
public final class de/itemis/mps/gradle/CommonKt {
@@ -72,28 +73,44 @@ public final class de/itemis/mps/gradle/CommonPlugin : org/gradle/api/Plugin {
7273
public fun apply (Lorg/gradle/api/Project;)V
7374
}
7475

75-
public class de/itemis/mps/gradle/CreateDmg : org/gradle/api/DefaultTask, groovy/lang/GroovyObject {
76-
public static synthetic field __$stMC Z
77-
protected synthetic fun $getStaticMetaClass ()Lgroovy/lang/MetaClass;
76+
public abstract class de/itemis/mps/gradle/Common_gradle$CI {
77+
public fun <init> (Lorg/gradle/api/Project;)V
78+
public final fun buildNumber ()I
79+
public final fun determineCI ()V
80+
public final fun get_project ()Lorg/gradle/api/Project;
81+
public final fun isCI ()Ljava/lang/Object;
82+
public final fun registerDependencyRepositories (Ljava/util/ArrayList;)V
83+
}
84+
85+
public abstract class de/itemis/mps/gradle/Common_gradle$Directories {
86+
public fun <init> (Lorg/gradle/api/Project;)V
87+
public final fun artifactsDir ()Ljava/io/File;
88+
public final fun get_project ()Lorg/gradle/api/Project;
89+
public final fun jnLibraryPath ()Ljava/io/File;
90+
public final fun scriptFile (Ljava/lang/String;)Ljava/io/File;
91+
}
92+
93+
public abstract class de/itemis/mps/gradle/Common_gradle$GitHubAuth {
94+
public fun <init> (Lorg/gradle/api/Project;)V
95+
public final fun getToken ()Ljava/lang/String;
96+
public final fun getUser ()Ljava/lang/String;
97+
}
98+
99+
public abstract class de/itemis/mps/gradle/Common_gradle$Itemis {
78100
public fun <init> ()V
79-
public fun build ()Ljava/lang/Object;
80-
public fun getBackgroundImage ()Ljava/io/File;
81-
public fun getDmgFile ()Ljava/io/File;
82-
public fun getJdk ()Ljava/io/File;
83-
public fun getMetaClass ()Lgroovy/lang/MetaClass;
84-
public fun getRcpArtifact ()Ljava/io/File;
85-
public fun getSignIdentity ()Ljava/lang/String;
86-
public fun getSignKeyChain ()Ljava/io/File;
87-
public fun getSignKeyChainPassword ()Ljava/lang/String;
88-
public fun setBackgroundImage (Ljava/lang/Object;)Ljava/lang/Object;
89-
public fun setDmgFile (Ljava/lang/Object;)Ljava/lang/Object;
90-
public fun setJdk (Ljava/lang/Object;)Ljava/lang/Object;
91-
public fun setJdkDependency (Ljava/lang/Object;)Ljava/lang/Object;
92-
public fun setMetaClass (Lgroovy/lang/MetaClass;)V
93-
public fun setRcpArtifact (Ljava/lang/Object;)Ljava/lang/Object;
94-
public fun setSignIdentity (Ljava/lang/String;)V
95-
public fun setSignKeyChain (Ljava/lang/Object;)Ljava/lang/Object;
96-
public fun setSignKeyChainPassword (Ljava/lang/String;)V
101+
public final fun itemisNexus ()Ljava/lang/String;
102+
public final fun mbeddrGitHub ()Ljava/lang/String;
103+
}
104+
105+
public abstract class de/itemis/mps/gradle/Common_gradle$JDK {
106+
public fun <init> (Lorg/gradle/api/Project;)V
107+
public final fun determine (Lorg/gradle/api/JavaVersion;)V
108+
public final fun get_project ()Lorg/gradle/api/Project;
109+
}
110+
111+
public final class de/itemis/mps/gradle/Common_gradle$inlined$sam$i$org_gradle_api_Action$0 : org/gradle/api/Action {
112+
public fun <init> (Lkotlin/jvm/functions/Function1;)V
113+
public final synthetic fun execute (Ljava/lang/Object;)V
97114
}
98115

99116
public final class de/itemis/mps/gradle/EnvironmentKind : java/lang/Enum {
@@ -118,15 +135,23 @@ public class de/itemis/mps/gradle/GenerateLibrariesXml : org/gradle/api/DefaultT
118135
public fun setOverrides (Ljava/lang/Object;)V
119136
}
120137

121-
public class de/itemis/mps/gradle/GetMpsInBrowser : org/gradle/api/DefaultTask, groovy/lang/GroovyObject {
122-
public static synthetic field __$stMC Z
123-
protected synthetic fun $getStaticMetaClass ()Lgroovy/lang/MetaClass;
138+
public class de/itemis/mps/gradle/GetMpsInBrowser : org/gradle/api/DefaultTask {
124139
public fun <init> ()V
125-
public fun build ()Ljava/lang/Object;
126-
public fun getMetaClass ()Lgroovy/lang/MetaClass;
127-
public fun getVersion ()Ljava/lang/String;
128-
public fun setMetaClass (Lgroovy/lang/MetaClass;)V
129-
public fun setVersion (Ljava/lang/String;)Ljava/lang/Object;
140+
public final fun build ()V
141+
public final fun getVersion ()Ljava/lang/String;
142+
public final fun setVersion (Ljava/lang/String;)V
143+
}
144+
145+
public final class de/itemis/mps/gradle/MPSVersion {
146+
public static final field Companion Lde/itemis/mps/gradle/MPSVersion$Companion;
147+
public synthetic fun <init> (Lnet/swiftzer/semver/SemVer;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
148+
public final fun getVersion ()Lnet/swiftzer/semver/SemVer;
149+
public final fun toMavenSnapshot ()Ljava/lang/String;
150+
public fun toString ()Ljava/lang/String;
151+
}
152+
153+
public final class de/itemis/mps/gradle/MPSVersion$Companion {
154+
public final fun parse (Ljava/lang/String;)Lde/itemis/mps/gradle/MPSVersion;
130155
}
131156

132157
public final class de/itemis/mps/gradle/Macro {
@@ -159,14 +184,10 @@ public final class de/itemis/mps/gradle/Plugin {
159184
public fun toString ()Ljava/lang/String;
160185
}
161186

162-
public class de/itemis/mps/gradle/Pom : groovy/lang/GroovyObject {
163-
public static synthetic field __$stMC Z
164-
protected synthetic fun $getStaticMetaClass ()Lgroovy/lang/MetaClass;
187+
public final class de/itemis/mps/gradle/Pom {
165188
public fun <init> ()V
166-
public fun getMetaClass ()Lgroovy/lang/MetaClass;
167-
public fun setMetaClass (Lgroovy/lang/MetaClass;)V
168-
public fun withDep (Lorg/gradle/api/publish/maven/MavenPom;Lorg/gradle/api/artifacts/Configuration;)Ljava/lang/Object;
169-
public fun withProvidedDep (Lorg/gradle/api/publish/maven/MavenPom;Lorg/gradle/api/artifacts/Configuration;)Ljava/lang/Object;
189+
public final fun withDep (Lorg/gradle/api/publish/maven/MavenPom;Lorg/gradle/api/artifacts/Configuration;)V
190+
public final fun withProvidedDep (Lorg/gradle/api/publish/maven/MavenPom;Lorg/gradle/api/artifacts/Configuration;)V
170191
}
171192

172193
public class de/itemis/mps/gradle/RunAntScript : org/gradle/api/DefaultTask {
@@ -197,12 +218,43 @@ public class de/itemis/mps/gradle/TestLanguages : de/itemis/mps/gradle/RunAntScr
197218
public fun <init> ()V
198219
}
199220

221+
public class de/itemis/mps/gradle/de/itemis/mps/gradle/CreateDmg : org/gradle/api/DefaultTask {
222+
public field backgroundImage Ljava/io/File;
223+
public field dmgFile Ljava/io/File;
224+
public field jdk Ljava/io/File;
225+
public field rcpArtifact Ljava/io/File;
226+
public fun <init> ()V
227+
public final fun build ()V
228+
public final fun getBackgroundImage ()Ljava/io/File;
229+
public final fun getDmgFile ()Ljava/io/File;
230+
public final fun getJdk ()Ljava/io/File;
231+
public final fun getRcpArtifact ()Ljava/io/File;
232+
public final fun getSignIdentity ()Ljava/lang/String;
233+
public final fun getSignKeyChain ()Ljava/io/File;
234+
public final fun getSignKeyChainPassword ()Ljava/lang/String;
235+
public final fun setBackgroundImage (Ljava/io/File;)V
236+
public final fun setBackgroundImage (Ljava/lang/Object;)V
237+
public final fun setDmgFile (Ljava/io/File;)V
238+
public final fun setDmgFile (Ljava/lang/Object;)V
239+
public final fun setJdk (Ljava/io/File;)V
240+
public final fun setJdk (Ljava/lang/Object;)V
241+
public final fun setJdkDependency (Ljava/lang/Object;)V
242+
public final fun setRcpArtifact (Ljava/io/File;)V
243+
public final fun setRcpArtifact (Ljava/lang/Object;)V
244+
public final fun setSignIdentity (Ljava/lang/String;)V
245+
public final fun setSignKeyChain (Ljava/io/File;)V
246+
public final fun setSignKeyChain (Ljava/lang/Object;)V
247+
public final fun setSignKeyChainPassword (Ljava/lang/String;)V
248+
}
249+
200250
public class de/itemis/mps/gradle/downloadJBR/DownloadJbrConfiguration {
201251
public field jbrVersion Ljava/lang/String;
202252
public fun <init> (Lorg/gradle/api/model/ObjectFactory;)V
253+
public final fun getDefaultJavaExecutable ()Z
203254
public final fun getDistributionType ()Ljava/lang/String;
204255
public final fun getDownloadDir ()Ljava/io/File;
205256
public final fun getJbrVersion ()Ljava/lang/String;
257+
public final fun setDefaultJavaExecutable (Z)V
206258
public final fun setDistributionType (Ljava/lang/String;)V
207259
public final fun setDownloadDir (Ljava/io/File;)V
208260
public final fun setJbrVersion (Ljava/lang/String;)V

‎src/main/kotlin/de/itemis/mps/gradle/common.gradle.kts

+9-4
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,15 @@ if (project.extra["skipResolveMps"].toString().toBoolean()) {
126126
}
127127
} else {
128128
tasks.register<Sync>("commonResolveMps") {
129-
dependsOn(configurations.getByName("mps"))
130-
dependsOn(configurations.getByName("common_mps"))
131-
from(configurations.getByName("mps").resolve().map { zipTree(it) })
132-
from(configurations.getByName("common_mps").resolve().map { zipTree(it) })
129+
if(configurations.findByName("mps")!= null) {
130+
dependsOn(configurations.getByName("mps"))
131+
from(configurations.getByName("mps").resolve().map { zipTree(it) })
132+
}
133+
if(configurations.findByName("common_mps")!= null) {
134+
dependsOn(configurations.getByName("common_mps"))
135+
from(configurations.getByName("common_mps").resolve().map { zipTree(it) })
136+
}
137+
133138
project.extra["mpsHomeDir"]?.let { into(it) }
134139
}
135140
}

‎src/main/kotlin/de/itemis/mps/gradle/downloadJBR/Plugin.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import org.gradle.api.Plugin
66
import org.gradle.api.Project
77
import org.gradle.api.file.DirectoryProperty
88
import org.gradle.api.model.ObjectFactory
9+
import org.gradle.kotlin.dsl.extra
910
import java.io.File
1011
import javax.inject.Inject
1112

@@ -15,13 +16,15 @@ open class DownloadJbrConfiguration @Inject constructor(objects: ObjectFactory)
1516
var distributionType : String? = null
1617
internal val downloadDirProperty: DirectoryProperty = objects.directoryProperty()
1718

19+
@Suppress("unused")
1820
var downloadDir: File?
1921
get() = downloadDirProperty.get().asFile
2022
set(value) {
2123
downloadDirProperty.set(value)
2224
}
2325
}
2426

27+
@Suppress("unused")
2528
open class DownloadJbrProjectPlugin : Plugin<Project> {
2629
override fun apply(project: Project) {
2730
project.run {
@@ -86,7 +89,7 @@ open class DownloadJbrProjectPlugin : Plugin<Project> {
8689
))
8790
javaExecutableProperty.set(jbrDirProperty.file(if (Os.isFamily(Os.FAMILY_WINDOWS)) "bin/java.exe" else "bin/java"))
8891
if(extension.defaultJavaExecutable) {
89-
project.setProperty("itemis.mps.gradle.ant.defaultJavaExecutable",javaExecutableProperty.asFile)
92+
project.extra["itemis.mps.gradle.ant.defaultJavaExecutable"] = javaExecutableProperty.asFile
9093
}
9194
}
9295
}

0 commit comments

Comments
 (0)