Update build to latest blowdryer and p2deps.

Author: nedtwigg

build.gradle

@@ -15,7 +15,7 @@ apply from: 干.file('base/sonatype.gradle')
 
 subprojects { subProject ->
 	apply plugin: 'java-library'
-	apply from: 干.file('base/java8.gradle')
+	apply from: 干.file('base/java.gradle')
 	apply from: 干.file('spotless/java.gradle')
 
 	ext.maven_name = subProject.name
@@ -47,12 +47,16 @@ subprojects { subProject ->
 			main = 'com.diffplug.common.swt.os.OS'
 		}
 	} else {
-		apply plugin: 'com.diffplug.eclipse.mavencentral'
 		String platformCode = project.name.substring('durian-swt.'.length())
 		String SWT_TO_USE = platformCode.endsWith("x86") ? SWT_VERSION_X86 : SWT_VERSION
-		eclipseMavenCentral {
-			release SWT_TO_USE, {
-				api "org.eclipse.swt.$platformCode"
+		apply plugin: 'dev.equo.p2deps'
+		p2deps {
+			into 'api', {
+				p2repo "https://download.eclipse.org/eclipse/updates/$SWT_TO_USE/"
+				install "org.eclipse.swt.$platformCode"
+				addFilter 'no-platform-filter', {
+					it.platformAll()
+				}
 			}
 		}
 		dependencies {

durian-swt/build.gradle

@@ -1,11 +1,11 @@
 apply from: 干.file('base/kotlin.gradle')
 
-apply plugin: 'com.diffplug.eclipse.mavencentral'
-eclipseMavenCentral {
-	release SWT_VERSION, {
-		api 'org.eclipse.swt'
-		api 'org.eclipse.jface'
-		useNativesForRunningPlatform()
+apply plugin: 'dev.equo.p2deps'
+p2deps {
+	into 'api', {
+		p2repo "https://download.eclipse.org/eclipse/updates/$SWT_VERSION/"
+		install 'org.eclipse.swt'
+		install 'org.eclipse.jface'
 	}
 }
 dependencies {
@@ -23,12 +23,6 @@ dependencies {
 	testImplementation "org.assertj:assertj-core:$VER_ASSERTJ"
 	testImplementation "com.diffplug.durian:durian-debug:$VER_DURIAN_DEBUG"
 }
-/*
- apply plugin: 'com.diffplug.gradle.eclipse.projectdeps'
- eclipseProjectDeps {
- replaceWithProject('durian-rx')
- }
- */
 // in java-library mode, durian-swt.os remains as a folder of classes for gradle internally, which the osgi plugin does not like
 tasks.named('jar').configure {
 	dependsOn(':durian-swt.os:jar')

gradle.properties

@@ -5,8 +5,10 @@ maven_desc=DurianSwt - Reactive utilities and fluent builders for SWT
 osgi_symbolic_name=com.diffplug.durian.swt
 osgi_export=com.diffplug.common.swt.*
 
+ver_java=8
+kotlin_jvmTarget=1.8
+
 # Build requirements
-VER_JAVA=1.8
 VER_FINDBUGS=3.0.1
 
 # Dependencies
@@ -15,8 +17,8 @@ VER_DURIAN_RX=4.0.0
 VER_DURIAN_DEBUG=1.0.0
 VER_RXJAVA=2.0.0
 # SWT Dependencies from P2
-SWT_VERSION=4.21.0
-SWT_VERSION_X86=4.7.0
+SWT_VERSION=4.21
+SWT_VERSION_X86=4.7
 
 # Testing
 VER_JUNIT=4.12

settings.gradle

@@ -1,29 +1,36 @@
 pluginManagement {
-	plugins {
-		id 'com.diffplug.blowdryer' version '1.5.1'
-		id 'com.diffplug.blowdryerSetup' version '1.5.1'
-		id 'com.diffplug.eclipse.mavencentral' version '3.36.0'
-		id 'com.diffplug.spotless' version '6.4.1'
-		id 'com.diffplug.spotless-changelog' version '2.4.0'
-		id 'com.gradle.plugin-publish' version '0.21.0'
-		id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
-		id 'org.jdrupes.mdoclet' version '1.0.10'
-		id 'org.jetbrains.kotlin.jvm' version '1.7.10'
+	repositories {
+		mavenCentral()
+		gradlePluginPortal()
 	}
 }
 plugins {
-	id 'com.diffplug.blowdryerSetup'
-	id 'com.diffplug.eclipse.mavencentral' apply false
-	id 'com.diffplug.spotless' apply false
-	id 'com.diffplug.spotless-changelog' apply false
-	id 'com.gradle.plugin-publish' apply false
-	id 'io.github.gradle-nexus.publish-plugin' apply false
-	id 'org.jdrupes.mdoclet' apply false
-	id 'org.jetbrains.kotlin.jvm' apply false
+	// https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md
+	id 'com.diffplug.blowdryerSetup' version '1.7.0'
+	// https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md
+	id 'com.diffplug.spotless' version '6.16.0' apply false
+	// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
+	id 'com.diffplug.spotless-changelog' version '3.0.1' apply false
+	// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
+	id 'com.gradle.plugin-publish' version '1.1.0' apply false
+	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
+	id 'dev.equo.ide' version '0.16.0' apply false
+	// https://github.com/gradle-nexus/publish-plugin/releases
+	id 'io.github.gradle-nexus.publish-plugin' version '1.2.0' apply false
+	// https://plugins.gradle.org/plugin/org.jetbrains.dokka
+	id 'org.jetbrains.dokka'                       version '1.8.10' apply false
+	// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
+	id 'org.jetbrains.kotlin.jvm'                  version '1.8.20' apply false
+	// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.plugin.serialization
+	id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.20' apply false
 }
 blowdryerSetup {
-	github 'diffplug/blowdryer-diffplug', 'tag', '5.2.1'
+	github 'diffplug/blowdryer-diffplug', 'tag', '7.0.2'
 	//devLocal '../blowdryer-diffplug'
+	setPluginsBlockTo {
+		it.file 'plugin.versions'
+		it.file 'plugin-kotlin.versions'
+	}
 }
 
 rootProject.name = 'durian-swt-root'