Skip to content

Update for post-bintray #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nedtwigg merged 5 commits into from
Feb 10, 2021
Merged

Update for post-bintray #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2bd1391
Bump gradle from 6.2.2 to 6.8.2
nedtwigg Jan 2, 2021
e541582
Bump mavencentral usage to latest.
nedtwigg Feb 10, 2021
b1b2f75
Use eclipseMavenCentral in our own build.
nedtwigg Feb 10, 2021
edf2b7e
Adapt bintray shutdown to repo.diffplug.com
nedtwigg Feb 10, 2021
8b74be9
Update changelog.
nedtwigg Feb 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Goomph releases

## [Unreleased]

### Fixed
- `ide` task now works again on macOS BigSur ([#131](https://github.com/diffplug/goomph/issues/131))
- Changed `p2-bootstrap` URLs to `repo.diffplug.com` because bintray is shutting down ([#135](https://github.com/diffplug/goomph/issues/135))

## [3.26.0] - 2020-12-22
### Added
Expand Down
31 changes: 19 additions & 12 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
// https://github.com/spotbugs/spotbugs-gradle-plugin/blob/master/CHANGELOG.md
id 'com.github.spotbugs' version '3.0.0'
id 'com.diffplug.eclipse.mavencentral'
}

apply plugin: 'com.diffplug.spotless-changelog'
Expand All @@ -27,6 +28,8 @@ String VER_DURIAN = '1.2.0'
String VER_DURIAN_SWT = '3.0.0'
String VER_BNDLIB = '5.0.0'
String OLDEST_SUPPORTED_GRADLE = '5.1'
String VER_P2_BOOTSTRAP = '4.7.2'

dependencies {
// Compile misc
implementation "com.diffplug.durian:durian-core:${VER_DURIAN}"
Expand All @@ -39,22 +42,26 @@ dependencies {
implementation "com.squareup.okio:okio:2.4.3"
// OSGi
implementation "biz.aQute.bnd:biz.aQute.bndlib:${VER_BNDLIB}"
// p2 (osgi used in 4.7.2 to match p2-bootstrap)
api "org.eclipse.platform:org.eclipse.osgi:3.12.50"
// eclipse 4.7.2
compileOnly 'org.eclipse.platform:org.eclipse.core.jobs:3.9.2'
compileOnly 'org.eclipse.platform:org.eclipse.core.runtime:3.13.0'
compileOnly 'org.eclipse.platform:org.eclipse.core.resources:3.12.0'
compileOnly 'org.eclipse.platform:org.eclipse.equinox.common:3.9.0'
compileOnly 'org.eclipse.platform:org.eclipse.ui.workbench:3.110.1'
compileOnly 'org.eclipse.pde:org.eclipse.pde.core:3.11.100'
compileOnly 'org.eclipse.jdt:org.eclipse.jdt.launching:3.9.51'
// from 4.6.3 cuz that's the latest one
compileOnly 'org.eclipse.emf:org.eclipse.emf.ecore:2.12.0'
// testing
testImplementation "junit:junit:4.13"
testImplementation "org.assertj:assertj-core:3.14.0"
// should be in eclipseMavenCentral, but it is missing
compileOnly 'org.eclipse.emf:org.eclipse.emf.ecore:2.12.0'
}
eclipseMavenCentral {
release VER_P2_BOOTSTRAP, {
api 'org.eclipse.osgi'
compileOnly 'org.eclipse.core.jobs'
compileOnly 'org.eclipse.core.runtime'
compileOnly 'org.eclipse.core.resources'
compileOnly 'org.eclipse.equinox.common'
compileOnly 'org.eclipse.ui.workbench'
compileOnly 'org.eclipse.pde.core'
compileOnly 'org.eclipse.jdt.launching'
//compileOnly 'org.eclipse.emf.ecore'
}
}

configurations.all {
exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.${osgi.platform}'
exclude group: 'com.sun.jna', module: 'com.sun.jna'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 7 additions & 18 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pluginManagement {
plugins {
id 'com.diffplug.blowdryer' version '1.0.0'
id 'com.diffplug.blowdryerSetup' version '1.0.0'
id 'com.diffplug.gradle.eclipse.mavencentral' version '3.22.0'
id 'com.diffplug.gradle.eclipse.mavencentral' version '3.26.0'
id 'com.diffplug.gradle.spotless' version '4.3.1'
id 'com.diffplug.spotless-changelog' version '2.0.0'
id 'com.gradle.plugin-publish' version '0.12.0'
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/com/diffplug/gradle/p2/P2BootstrapInstallation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2016-2019 DiffPlug
* Copyright (C) 2016-2021 DiffPlug
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -33,7 +33,7 @@

/** Wraps a Bootstrap installation for the given eclipse release. */
class P2BootstrapInstallation {
static final String DOWNLOAD_ROOT = "https://dl.bintray.com/diffplug/opensource/com/diffplug/gradle/goomph-p2-bootstrap/";
static final String DOWNLOAD_ROOT = "https://repo.diffplug.com/misc/goomph-p2-bootstrap";
static final String DOWNLOAD_FILE = "/goomph-p2-bootstrap.zip";
static final String VERSIONED_DOWNLOAD_FILE = "/goomph-p2-bootstrap-%s.zip";

Expand All @@ -45,7 +45,7 @@ class P2BootstrapInstallation {
final EclipseRelease release;

static P2BootstrapInstallation latest() {
EclipseRelease latest = SUPPORTED.asList().listIterator(SUPPORTED.size()).previous();
EclipseRelease latest = SUPPORTED.asList().get(SUPPORTED.size() - 1);
return new P2BootstrapInstallation(latest);
}

Expand Down Expand Up @@ -82,9 +82,10 @@ private void install() throws IOException {
// download the URL
File target = new File(getRootFolder(), DOWNLOAD_FILE);
try {
FileMisc.download(GoomphCacheLocations.p2bootstrapUrl().orElse(DOWNLOAD_ROOT) + release.version() + DOWNLOAD_FILE, target);
// s3 example
FileMisc.download(GoomphCacheLocations.p2bootstrapUrl().orElse(DOWNLOAD_ROOT) + String.format(VERSIONED_DOWNLOAD_FILE, release.version()), target);
} catch (FileNotFoundException ex) {
//try versioned artifact - Common when boostrap is on a maven type(sonatype nexus, etc.) repository.
// try versioned artifact - Common when boostrap is on a maven type(sonatype nexus, etc.) repository.
FileMisc.download(GoomphCacheLocations.p2bootstrapUrl().orElse(DOWNLOAD_ROOT) + release.version() + String.format(VERSIONED_DOWNLOAD_FILE, release.version()), target);
}
// unzip it
Expand Down