Fix the build for JUnit 5.

Author: nedtwigg

atplug-runtime/src/main/java/com/diffplug/atplug/PlugInstanceMap.kt

@@ -10,13 +10,13 @@ class PlugInstanceMap {
 	internal val descriptorMap = mutableMapOf<String, MutableList<PlugDescriptor>>()
 	internal val instanceMap = mutableMapOf<PlugDescriptor, Any>()
 
-	fun put(clazz: String, descriptor: PlugDescriptor) {
+	fun putDescriptor(clazz: String, descriptor: PlugDescriptor) {
 		val descriptors = descriptorMap.computeIfAbsent(clazz) { mutableListOf<PlugDescriptor>() }
 		descriptors.add(descriptor)
 	}
 
-	fun <T> put(clazz: Class<T>, descriptor: PlugDescriptor, instance: T) {
-		put(clazz.name, descriptor)
+	fun <T> putInstance(clazz: Class<T>, descriptor: PlugDescriptor, instance: T) {
+		putDescriptor(clazz.name, descriptor)
 		instanceMap[descriptor] = instance!!
 	}
 

atplug-runtime/src/main/java/com/diffplug/atplug/PlugRegistry.kt

@@ -74,7 +74,7 @@ interface PlugRegistry {
 									val asString = manifestUrl.toExternalForm()
 									val component = parseComponent(asString, servicePath)
 									synchronized(this) {
-										data.put(component.provides, component)
+										data.putDescriptor(component.provides, component)
 										owners.get(component.provides)?.doRegister(component)
 									}
 								}

atplug-test-harness/src/main/java/com/diffplug/atplug/PlugHarness.kt

@@ -8,13 +8,12 @@ package com.diffplug.atplug
 
 import java.lang.AutoCloseable
 
-/** Creates a harness for local plugin setup. */
 class PlugHarness {
 	var map = PlugInstanceMap()
 
 	fun <T> add(clazz: Class<T>, instance: T): PlugHarness {
 		val descriptor = SocketOwner.metadataGeneratorFor(clazz).apply(instance)
-		map.put(clazz, PlugDescriptor.fromJson(descriptor), instance)
+		map.putInstance(clazz, PlugDescriptor.fromJson(descriptor), instance)
 		return this
 	}
 
@@ -23,5 +22,6 @@ class PlugHarness {
 		return AutoCloseable { PlugRegistry.setHarness(null) }
 	}
 
+	/** Returns a beforeEach/afterEach plugin for JUnit5. */
 	fun junit5() = com.diffplug.atplug.junit5.AtPlugJUnit5(this)
 }

build.gradle

@@ -12,7 +12,7 @@ allprojects {
 apply from: 干.file('spotless/freshmark.gradle')
 apply from: 干.file('base/sonatype.gradle')
 
-String VER_JUNIT_JUPITER = '5.0.0'
+String VER_JUNIT_JUPITER = '5.8.2'
 subprojects {
 	apply from: 干.file('base/java8.gradle')
 	apply from: 干.file('base/kotlin.gradle')
@@ -36,7 +36,7 @@ subprojects {
 	} else if (it.name == 'atplug-test-harness') {
 		ext.maven_name='AtPlug test harness'
 		dependencies {
-			compileOnly "org.junit.jupiter:junit-jupiter-api:${VER_JUNIT_JUPITER}"
+			compileOnly "org.junit.jupiter:junit-jupiter-api:5.0.0"
 			implementation "org.jetbrains.kotlin:kotlin-reflect:1.6.10"
 			implementation project(':atplug-runtime')
 		}