diff options
3 files changed, 48 insertions, 1 deletions
diff --git a/build/export_generators/ide-gradle/build.gradle.kts.jinja b/build/export_generators/ide-gradle/build.gradle.kts.jinja index a64bf204214..9794eb2b3f5 100644 --- a/build/export_generators/ide-gradle/build.gradle.kts.jinja +++ b/build/export_generators/ide-gradle/build.gradle.kts.jinja @@ -47,6 +47,30 @@ group = "{{ target.publish_group }}" version = {% if target.publish_version and target.publish_version != "no" -%}"{{ target.publish_version }}"{%- else -%}project.properties["version"]{%- endif %} {% endif %} +{% if target.enable_preview %} +tasks.withType<JavaCompile> { + options.compilerArgs.add("--enable-preview") + + options.compilerArgs.add("-Xlint:preview") + options.release.set({%- if target.required_jdk -%}{{ target.required_jdk }}{%- else -%}17{%- endif -%}) +} + + +tasks.withType<JavaExec> { + jvmArgs?.add("--enable-preview") + } +tasks.withType<Test> { + jvmArgs?.add("--enable-preview") + environment["JAVA_TOOL_OPTIONS"] = "--enable-preview" +} + +tasks.withType<Javadoc> { + val javadocOptions = options as CoreJavadocOptions + javadocOptions.addStringOption("source", "{%- if target.required_jdk -%}{{ target.required_jdk }}{%- else -%}17{%- endif -%}") + javadocOptions.addBooleanOption("-enable-preview", true) +} +{% endif %} + val bucketUsername: String by project val bucketPassword: String by project @@ -123,6 +147,19 @@ sourceSets.main.java.srcDirs += "{{ srcdir_glob[0] }}" {%- endif -%} {%- endfor -%} +sourceSets { + val test by getting { + java.srcDir("ut/java") + resources.srcDir("ut/resources") + java.srcDir("src/test-integration/java") + resources.srcDir("src/test-integration/resources") + java.srcDir("src/testFixtures/java") + resources.srcDir("src/testFixtures/resources") + java.srcDir("src/intTest/java") + resources.srcDir("src/intTest/resources") + } +} + dependencies { {%- for library in target.consumer if library.classpath -%} {%- if library.prebuilt and library.jar and (library.type != "contrib" or build_contribs) %} diff --git a/build/export_generators/ide-gradle/build.gradle.kts.proto.jinja b/build/export_generators/ide-gradle/build.gradle.kts.proto.jinja index 841c49f14b9..156dc216e50 100644 --- a/build/export_generators/ide-gradle/build.gradle.kts.proto.jinja +++ b/build/export_generators/ide-gradle/build.gradle.kts.proto.jinja @@ -31,6 +31,14 @@ repositories { } } +sourceSets { + main { + java.srcDir("build/generated/source/proto") + } +} + +val project_root="{%- if exportRoot.startswith(arcadiaRoot + '/') -%}{{ arcadiaRoot }}{%- else -%}{{ exportRoot }}{%- endif -%}" + java { withSourcesJar() withJavadocJar() diff --git a/build/export_generators/ide-gradle/generator.toml b/build/export_generators/ide-gradle/generator.toml index 28fb468eab9..67d1b1626f8 100644 --- a/build/export_generators/ide-gradle/generator.toml +++ b/build/export_generators/ide-gradle/generator.toml @@ -72,5 +72,7 @@ test=[ "/ut", "/src/test", "/src/test/java", - "/src/test-integration" + "/src/test-integration", + "/src/testFixtures", + "/src/intTest", ] |