Fix loom.accessWidener being a read-only property in Kotlin (#447)
* Re-enable Kotlin test because the related bug has been fixed * Fix loom.accessWidener being a read-only property in Kotlin * Remove Kotlin test exclusions
This commit is contained in:
parent
ef2816b0d0
commit
b558ee1a46
5 changed files with 5 additions and 12 deletions
6
.github/workflows/test-push.yml
vendored
6
.github/workflows/test-push.yml
vendored
|
@ -45,9 +45,6 @@ jobs:
|
|||
matrix:
|
||||
java: [jdk16]
|
||||
test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
|
||||
exclude:
|
||||
- java: jdk16
|
||||
test: net.fabricmc.loom.test.integration.KotlinTest
|
||||
|
||||
runs-on: ubuntu-20.04
|
||||
container:
|
||||
|
@ -74,9 +71,6 @@ jobs:
|
|||
matrix:
|
||||
java: [16]
|
||||
test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
|
||||
exclude:
|
||||
- java: 16
|
||||
test: net.fabricmc.loom.test.integration.KotlinTest
|
||||
|
||||
runs-on: windows-2019
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ import net.fabricmc.loom.configuration.providers.mappings.LayeredMappingSpecBuil
|
|||
public interface LoomGradleExtensionAPI {
|
||||
File getAccessWidener();
|
||||
|
||||
void setAccessWidener(Object file);
|
||||
void setAccessWidener(File file);
|
||||
|
||||
void setShareCaches(boolean shareCaches);
|
||||
|
||||
|
|
|
@ -74,9 +74,9 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA
|
|||
}
|
||||
|
||||
@Override
|
||||
public void setAccessWidener(Object file) {
|
||||
public void setAccessWidener(File file) {
|
||||
Objects.requireNonNull(file, "Access widener file cannot be null");
|
||||
this.accessWidener = getProject().file(file);
|
||||
this.accessWidener = file;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -31,7 +31,6 @@ import spock.lang.Unroll
|
|||
|
||||
import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
|
||||
|
||||
@IgnoreIf({ jvm.java16Compatible }) // Fails on J16 > due to https://youtrack.jetbrains.com/issue/KT-45566
|
||||
class KotlinTest extends Specification implements ProjectTestTrait {
|
||||
@Override
|
||||
String name() {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import java.util.Properties
|
||||
|
||||
plugins {
|
||||
kotlin("jvm") version "1.4.31"
|
||||
kotlin("jvm") version "1.5.21"
|
||||
id("fabric-loom")
|
||||
}
|
||||
|
||||
|
@ -16,5 +16,5 @@ dependencies {
|
|||
minecraft(group = "com.mojang", name = "minecraft", version = "1.16.5")
|
||||
mappings(group = "net.fabricmc", name = "yarn", version = "1.16.5+build.5", classifier = "v2")
|
||||
modImplementation("net.fabricmc:fabric-loader:0.11.2")
|
||||
modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = "1.5.0+kotlin.1.4.31")
|
||||
modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = "1.6.3+kotlin.1.5.21")
|
||||
}
|
Loading…
Reference in a new issue