diff --git a/build.gradle b/build.gradle index 7474a7e4..e7a03f6d 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,8 @@ subprojects { subProject -> ext.maven_name = subProject.name ext.javadoc_links = [ - "https://javadoc.io/doc/com.diffplug.durian/durian-core/${VER_DURIAN}", "https://javadoc.io/doc/com.diffplug.durian/durian-collect/${VER_DURIAN}", "https://javadoc.io/doc/com.diffplug.durian/durian-concurrent/${VER_DURIAN}", - "https://javadoc.io/doc/com.diffplug.durian/durian-debug/${VER_DURIAN_DEBUG}", "https://javadoc.io/doc/com.diffplug.durian/durian-rx/${VER_DURIAN_RX}", 'https://docs.oracle.com/javase/8/docs/api/' ].join(' ') @@ -56,7 +54,7 @@ subprojects { subProject -> } } else { String platformCode = project.name.substring('durian-swt.'.length()) - String SWT_TO_USE = platformCode.endsWith("x86") ? SWT_VERSION_X86 : SWT_VERSION + String SWT_TO_USE = platformCode.endsWith("x86") ? VER_ECLIPSE_PLATFORM_X86 : VER_ECLIPSE_PLATFORM apply plugin: 'dev.equo.p2deps' p2deps { into 'api', { diff --git a/durian-swt/build.gradle b/durian-swt/build.gradle index eaba880e..c5b461c2 100644 --- a/durian-swt/build.gradle +++ b/durian-swt/build.gradle @@ -3,7 +3,7 @@ apply from: 干.file('base/kotlin.gradle') apply plugin: 'dev.equo.p2deps' p2deps { into 'api', { - p2repo "https://download.eclipse.org/eclipse/updates/$SWT_VERSION/" + p2repo "https://download.eclipse.org/eclipse/updates/$VER_ECLIPSE_PLATFORM/" install 'org.eclipse.swt' install 'org.eclipse.jface' addFilter 'no-platform', { @@ -11,11 +11,11 @@ p2deps { } } into 'compileOnly', { - p2repo "https://download.eclipse.org/eclipse/updates/$SWT_VERSION/" + p2repo "https://download.eclipse.org/eclipse/updates/$VER_ECLIPSE_PLATFORM/" install 'org.eclipse.swt' } into 'testImplementation', { - p2repo "https://download.eclipse.org/eclipse/updates/$SWT_VERSION/" + p2repo "https://download.eclipse.org/eclipse/updates/$VER_ECLIPSE_PLATFORM/" install 'org.eclipse.swt' } } diff --git a/gradle.properties b/gradle.properties index 7734a394..16a8ae63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,8 +16,8 @@ VER_DURIAN=1.2.0 VER_DURIAN_RX=5.0.1 VER_DURIAN_DEBUG=1.1.0 # SWT Dependencies from P2 -SWT_VERSION=4.21 -SWT_VERSION_X86=4.7 +VER_ECLIPSE_PLATFORM=4.34 +VER_ECLIPSE_PLATFORM_X86=4.7 # Testing VER_JUNIT=4.13.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a84e188..2e111328 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 851cf5af..ad6202ac 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,11 +8,13 @@ plugins { // https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md id 'com.diffplug.blowdryerSetup' version '1.7.1' // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md - id 'com.diffplug.spotless' version '7.0.4' apply false + id 'com.diffplug.spotless' version '7.2.1' apply false // https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md id 'com.diffplug.spotless-changelog' version '3.1.2' apply false // https://plugins.gradle.org/plugin/com.gradle.plugin-publish id 'com.gradle.plugin-publish' version '1.3.1' apply false + // https://plugins.gradle.org/plugin/com.gradle.develocity + id 'com.gradle.develocity' version '4.1.1' // https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md id 'dev.equo.ide' version '1.7.8' apply false // https://github.com/gradle-nexus/publish-plugin/releases @@ -29,7 +31,7 @@ plugins { id 'dev.adamko.dokkatoo-html' version '2.4.0' apply false } blowdryerSetup { - github 'diffplug/blowdryer-diffplug', 'tag', '9.0.5' + github 'diffplug/blowdryer-diffplug', 'tag', '9.1.0' //devLocal '../blowdryer-diffplug' setPluginsBlockTo { it.file 'plugin.versions' @@ -47,3 +49,5 @@ include 'durian-swt.gtk.linux.x86_64' include 'durian-swt.gtk.linux.x86' include 'durian-swt.win32.win32.x86_64' include 'durian-swt.win32.win32.x86' + +apply from: com.diffplug.blowdryer.Blowdryer.file('base/buildscan-on-ci.gradle') \ No newline at end of file