Skip to content
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

Jump to bottom

gradle: Organize imports #5342

Merged
merged 1 commit into from Aug 18, 2022
Merged

gradle: Organize imports #5342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
517 changes: 0 additions & 517 deletions gradle-plugins/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop

This file was deleted.

148 changes: 0 additions & 148 deletions gradle-plugins/.settings/org.eclipse.jdt.ui.prefs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gradle-plugins/biz.aQute.bnd.gradle/.settings/org.eclipse.jdt.ui.prefs
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ formatter_settings_version=16
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.ignorelowercasenames=true
org.eclipse.jdt.ui.importorder=java;javax;org;com;
org.eclipse.jdt.ui.importorder=java;javax;
org.eclipse.jdt.ui.javadoc=false
org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.ondemandthreshold=99
Expand Down
2 changes: 1 addition & 1 deletion gradle-plugins/biz.aQute.bnd.gradle/src/dsl/kotlin/org/gradle/kotlin/dsl/jarBundle.kt
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@

package org.gradle.kotlin.dsl

import org.gradle.api.tasks.bundling.Jar
import aQute.bnd.gradle.BundleTaskExtension
import org.gradle.api.tasks.bundling.Jar

val Jar.bundle: BundleTaskExtension
get() = the()
Expand Down
23 changes: 11 additions & 12 deletions gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/AbstractBndrun.java
View file
Open in desktop
Expand Up @@ -16,6 +16,17 @@
import java.util.Optional;
import java.util.Properties;

import aQute.bnd.build.Project;
import aQute.bnd.build.Workspace;
import aQute.bnd.build.model.EE;
import aQute.bnd.osgi.Constants;
import aQute.bnd.osgi.Domain;
import aQute.bnd.osgi.Processor;
import aQute.bnd.repository.fileset.FileSetRepository;
import aQute.bnd.service.RepositoryPlugin;
import aQute.bnd.unmodifiable.Maps;
import aQute.lib.io.IO;
import aQute.lib.strings.Strings;
import org.gradle.api.DefaultTask;
import org.gradle.api.GradleException;
import org.gradle.api.artifacts.Configuration;
Expand All @@ -38,18 +49,6 @@
import org.gradle.api.tasks.compile.JavaCompile;
import org.gradle.work.NormalizeLineEndings;

import aQute.bnd.build.Project;
import aQute.bnd.build.Workspace;
import aQute.bnd.build.model.EE;
import aQute.bnd.osgi.Constants;
import aQute.bnd.osgi.Domain;
import aQute.bnd.osgi.Processor;
import aQute.bnd.repository.fileset.FileSetRepository;
import aQute.bnd.service.RepositoryPlugin;
import aQute.bnd.unmodifiable.Maps;
import aQute.lib.io.IO;
import aQute.lib.strings.Strings;

/**
* Abstract Bndrun task type for Gradle.
* <p>
Expand Down
23 changes: 11 additions & 12 deletions gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Baseline.java
View file
Open in desktop
Expand Up @@ -19,6 +19,17 @@
import java.util.Objects;
import java.util.stream.StreamSupport;

import aQute.bnd.differ.Baseline.BundleInfo;
import aQute.bnd.differ.Baseline.Info;
import aQute.bnd.differ.DiffPluginImpl;
import aQute.bnd.header.Parameters;
import aQute.bnd.osgi.Instructions;
import aQute.bnd.osgi.Jar;
import aQute.bnd.osgi.Processor;
import aQute.bnd.service.diff.Diff;
import aQute.bnd.version.Version;
import aQute.lib.io.IO;
import aQute.lib.strings.Strings;
import org.gradle.api.DefaultTask;
import org.gradle.api.GradleException;
import org.gradle.api.file.ConfigurableFileCollection;
Expand All @@ -37,18 +48,6 @@
import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.OutputFile;
import org.gradle.api.tasks.TaskAction;

import aQute.bnd.differ.Baseline.BundleInfo;
import aQute.bnd.differ.Baseline.Info;
import aQute.bnd.differ.DiffPluginImpl;
import aQute.bnd.header.Parameters;
import aQute.bnd.osgi.Instructions;
import aQute.bnd.osgi.Jar;
import aQute.bnd.osgi.Processor;
import aQute.bnd.service.diff.Diff;
import aQute.bnd.version.Version;
import aQute.lib.io.IO;
import aQute.lib.strings.Strings;
import org.gradle.language.base.plugins.LifecycleBasePlugin;

/**
Expand Down
4 changes: 1 addition & 3 deletions gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndBuilderPlugin.java
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@

import java.util.Objects;

import aQute.bnd.unmodifiable.Maps;
import org.gradle.api.GradleException;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
Expand All @@ -20,9 +21,6 @@
import org.gradle.api.tasks.TaskContainer;
import org.gradle.api.tasks.TaskProvider;
import org.gradle.api.tasks.bundling.Jar;
import org.gradle.language.base.plugins.LifecycleBasePlugin;

import aQute.bnd.unmodifiable.Maps;

/**
* BndBuilderPlugin for Gradle.
Expand Down
25 changes: 12 additions & 13 deletions gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndPlugin.java
View file
Open in desktop
Expand Up @@ -27,6 +27,18 @@
import java.util.Optional;
import java.util.stream.StreamSupport;

import aQute.bnd.build.Container;
import aQute.bnd.build.Container.TYPE;
import aQute.bnd.build.Workspace;
import aQute.bnd.exceptions.Exceptions;
import aQute.bnd.exporter.executable.ExecutableJarExporter;
import aQute.bnd.exporter.runbundles.RunbundlesExporter;
import aQute.bnd.osgi.About;
import aQute.bnd.osgi.Constants;
import aQute.bnd.stream.MapStream;
import aQute.bnd.unmodifiable.Maps;
import aQute.lib.io.IO;
import aQute.lib.strings.Strings;
import org.gradle.api.Action;
import org.gradle.api.GradleException;
import org.gradle.api.JavaVersion;
Expand Down Expand Up @@ -70,19 +82,6 @@
import org.gradle.process.CommandLineArgumentProvider;
import org.slf4j.LoggerFactory;

import aQute.bnd.build.Container;
import aQute.bnd.build.Container.TYPE;
import aQute.bnd.build.Workspace;
import aQute.bnd.exceptions.Exceptions;
import aQute.bnd.exporter.executable.ExecutableJarExporter;
import aQute.bnd.exporter.runbundles.RunbundlesExporter;
import aQute.bnd.osgi.About;
import aQute.bnd.osgi.Constants;
import aQute.bnd.stream.MapStream;
import aQute.bnd.unmodifiable.Maps;
import aQute.lib.io.IO;
import aQute.lib.strings.Strings;

/**
* BndPlugin for Gradle.
* <p>
Expand Down
5 changes: 2 additions & 3 deletions gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndPluginExtension.java
View file
Open in desktop
Expand Up @@ -2,11 +2,10 @@

import java.util.Objects;

import org.gradle.api.plugins.ExtensionAware;
import org.gradle.api.plugins.ExtraPropertiesExtension;

import aQute.bnd.build.Project;
import groovy.lang.MissingPropertyException;
import org.gradle.api.plugins.ExtensionAware;
import org.gradle.api.plugins.ExtraPropertiesExtension;

/**
* BndPluginExtension for Gradle.
Expand Down
5 changes: 2 additions & 3 deletions gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndUtils.java
View file
Open in desktop
Expand Up @@ -6,6 +6,8 @@
import java.util.Optional;
import java.util.function.BiFunction;

import aQute.service.reporter.Report;
import aQute.service.reporter.Report.Location;
import org.gradle.api.Buildable;
import org.gradle.api.Project;
import org.gradle.api.Task;
Expand All @@ -26,9 +28,6 @@
import org.gradle.jvm.toolchain.JavaToolchainSpec;
import org.gradle.util.GradleVersion;

import aQute.service.reporter.Report;
import aQute.service.reporter.Report.Location;

/**
* BndUtils class.
*/
Expand Down
13 changes: 6 additions & 7 deletions gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/BndWorkspacePlugin.java
View file
Open in desktop
Expand Up @@ -10,6 +10,12 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import aQute.bnd.build.Workspace;
import aQute.bnd.exceptions.Exceptions;
import aQute.bnd.osgi.Constants;
import aQute.bnd.unmodifiable.Sets;
import aQute.lib.strings.Strings;
import groovy.lang.Closure;
import org.gradle.StartParameter;
import org.gradle.api.Action;
import org.gradle.api.GradleException;
Expand All @@ -25,13 +31,6 @@
import org.gradle.internal.metaobject.DynamicObject;
import org.gradle.language.base.plugins.LifecycleBasePlugin;

import aQute.bnd.build.Workspace;
import aQute.bnd.exceptions.Exceptions;
import aQute.bnd.osgi.Constants;
import aQute.bnd.unmodifiable.Sets;
import aQute.lib.strings.Strings;
import groovy.lang.Closure;

/**
* BndWorkspacePlugin for Gradle.
* <p>
Expand Down
7 changes: 3 additions & 4 deletions gradle-plugins/biz.aQute.bnd.gradle/src/main/java/aQute/bnd/gradle/Bndrun.java
View file
Open in desktop
Expand Up @@ -10,6 +10,9 @@
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ScheduledExecutorService;

import aQute.bnd.build.Project;
import aQute.bnd.build.ProjectLauncher;
import aQute.lib.io.IO;
import org.gradle.api.GradleException;
import org.gradle.api.model.ObjectFactory;
import org.gradle.api.provider.Property;
Expand All @@ -20,10 +23,6 @@
import org.gradle.jvm.toolchain.JavaLauncher;
import org.gradle.jvm.toolchain.JavaToolchainService;

import aQute.bnd.build.Project;
import aQute.bnd.build.ProjectLauncher;
import aQute.lib.io.IO;

/**
* OSGi Bndrun task type for Gradle.
* <p>
Expand Down