diff --git a/flow-plugins/flow-dev-bundle-plugin/src/main/java/com/vaadin/flow/plugin/maven/BuildDevBundleMojo.java b/flow-plugins/flow-dev-bundle-plugin/src/main/java/com/vaadin/flow/plugin/maven/BuildDevBundleMojo.java index 91cc0495715..751c7731f13 100644 --- a/flow-plugins/flow-dev-bundle-plugin/src/main/java/com/vaadin/flow/plugin/maven/BuildDevBundleMojo.java +++ b/flow-plugins/flow-dev-bundle-plugin/src/main/java/com/vaadin/flow/plugin/maven/BuildDevBundleMojo.java @@ -55,6 +55,7 @@ import com.vaadin.flow.component.dependency.JsModule; import com.vaadin.flow.component.dependency.NpmPackage; import com.vaadin.flow.internal.FrontendUtils; +import com.vaadin.flow.internal.Platform; import com.vaadin.flow.plugin.base.BuildFrontendUtil; import com.vaadin.flow.plugin.base.PluginAdapterBase; import com.vaadin.flow.plugin.base.PluginAdapterBuild; @@ -63,7 +64,6 @@ import com.vaadin.flow.server.frontend.ExecutionFailedException; import com.vaadin.flow.server.frontend.FrontendTools; import com.vaadin.flow.server.frontend.installer.NodeInstaller; -import com.vaadin.flow.server.frontend.installer.Platform; import com.vaadin.flow.server.frontend.scanner.ClassFinder; import com.vaadin.flow.server.scanner.ReflectionsClassFinder; import com.vaadin.flow.theme.Theme; diff --git a/flow-plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinFlowPluginExtension.kt b/flow-plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinFlowPluginExtension.kt index 7153965f69f..749269e07c7 100644 --- a/flow-plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinFlowPluginExtension.kt +++ b/flow-plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinFlowPluginExtension.kt @@ -25,7 +25,7 @@ import com.vaadin.flow.server.frontend.FrontendTools import com.vaadin.flow.server.frontend.FrontendToolsSettings import com.vaadin.flow.internal.FrontendUtils import com.vaadin.flow.server.frontend.installer.NodeInstaller -import com.vaadin.flow.server.frontend.installer.Platform +import com.vaadin.flow.internal.Platform import groovy.lang.Closure import groovy.lang.DelegatesTo import org.gradle.api.Action diff --git a/flow-plugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/FlowModeAbstractMojo.java b/flow-plugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/FlowModeAbstractMojo.java index 643fc3a4a76..1717d2d755a 100644 --- a/flow-plugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/FlowModeAbstractMojo.java +++ b/flow-plugins/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/FlowModeAbstractMojo.java @@ -47,6 +47,7 @@ import org.codehaus.plexus.build.BuildContext; import com.vaadin.flow.internal.FrontendUtils; +import com.vaadin.flow.internal.Platform; import com.vaadin.flow.internal.StringUtil; import com.vaadin.flow.plugin.base.BuildFrontendUtil; import com.vaadin.flow.plugin.base.PluginAdapterBase; @@ -54,7 +55,6 @@ import com.vaadin.flow.server.InitParameters; import com.vaadin.flow.server.frontend.FrontendTools; import com.vaadin.flow.server.frontend.installer.NodeInstaller; -import com.vaadin.flow.server.frontend.installer.Platform; import com.vaadin.flow.server.frontend.scanner.ClassFinder; import com.vaadin.flow.server.scanner.ReflectionsClassFinder; diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/installer/Platform.java b/flow-server/src/main/java/com/vaadin/flow/internal/Platform.java similarity index 98% rename from flow-server/src/main/java/com/vaadin/flow/server/frontend/installer/Platform.java rename to flow-server/src/main/java/com/vaadin/flow/internal/Platform.java index e99f046c623..bea6855df85 100644 --- a/flow-server/src/main/java/com/vaadin/flow/server/frontend/installer/Platform.java +++ b/flow-server/src/main/java/com/vaadin/flow/internal/Platform.java @@ -13,14 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.flow.server.frontend.installer; +package com.vaadin.flow.internal; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import com.vaadin.flow.internal.FrontendVersion; - /** * Platform contains information about system architecture and OS. *

diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendTools.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendTools.java index 372ccccc060..12fad12be6d 100644 --- a/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendTools.java +++ b/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendTools.java @@ -38,9 +38,9 @@ import com.vaadin.flow.internal.FrontendUtils.UnknownVersionException; import com.vaadin.flow.internal.FrontendVersion; import com.vaadin.flow.internal.Pair; +import com.vaadin.flow.internal.Platform; import com.vaadin.flow.server.InitParameters; import com.vaadin.flow.server.frontend.installer.NodeInstaller; -import com.vaadin.flow.server.frontend.installer.Platform; import com.vaadin.flow.server.frontend.installer.ProxyConfig; import com.vaadin.flow.server.startup.ApplicationConfiguration; diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendToolsSettings.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendToolsSettings.java index f973025227b..4b8d9b28c4e 100644 --- a/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendToolsSettings.java +++ b/flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendToolsSettings.java @@ -22,9 +22,9 @@ import com.vaadin.flow.function.SerializableSupplier; import com.vaadin.flow.internal.FrontendUtils; +import com.vaadin.flow.internal.Platform; import com.vaadin.flow.server.Constants; import com.vaadin.flow.server.frontend.installer.NodeInstaller; -import com.vaadin.flow.server.frontend.installer.Platform; import static com.vaadin.flow.server.frontend.FrontendTools.DEFAULT_NODE_VERSION; diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/Options.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/Options.java index 0ef7556e17b..520fea80637 100644 --- a/flow-server/src/main/java/com/vaadin/flow/server/frontend/Options.java +++ b/flow-server/src/main/java/com/vaadin/flow/server/frontend/Options.java @@ -29,9 +29,9 @@ import com.vaadin.experimental.FeatureFlags; import com.vaadin.flow.di.Lookup; import com.vaadin.flow.internal.FrontendUtils; +import com.vaadin.flow.internal.Platform; import com.vaadin.flow.server.Constants; import com.vaadin.flow.server.frontend.installer.NodeInstaller; -import com.vaadin.flow.server.frontend.installer.Platform; import com.vaadin.flow.server.frontend.scanner.ClassFinder; import com.vaadin.flow.server.frontend.scanner.FrontendDependenciesScanner; diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/installer/NodeInstaller.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/installer/NodeInstaller.java index cb8013fbc70..97eb40c62c2 100644 --- a/flow-server/src/main/java/com/vaadin/flow/server/frontend/installer/NodeInstaller.java +++ b/flow-server/src/main/java/com/vaadin/flow/server/frontend/installer/NodeInstaller.java @@ -35,6 +35,7 @@ import com.vaadin.flow.internal.FrontendVersion; import com.vaadin.flow.internal.MessageDigestUtil; import com.vaadin.flow.internal.Pair; +import com.vaadin.flow.internal.Platform; import com.vaadin.frontendtools.installer.ArchiveExtractionException; import com.vaadin.frontendtools.installer.ArchiveExtractor; import com.vaadin.frontendtools.installer.DefaultArchiveExtractor; diff --git a/flow-server/src/test/java/com/vaadin/flow/server/frontend/FrontendToolsTest.java b/flow-server/src/test/java/com/vaadin/flow/server/frontend/FrontendToolsTest.java index 693e18bb69e..02e9bfcf872 100644 --- a/flow-server/src/test/java/com/vaadin/flow/server/frontend/FrontendToolsTest.java +++ b/flow-server/src/test/java/com/vaadin/flow/server/frontend/FrontendToolsTest.java @@ -50,8 +50,8 @@ import com.vaadin.flow.function.SerializableSupplier; import com.vaadin.flow.internal.FrontendUtils; import com.vaadin.flow.internal.FrontendVersion; +import com.vaadin.flow.internal.Platform; import com.vaadin.flow.internal.ReflectTools; -import com.vaadin.flow.server.frontend.installer.Platform; import com.vaadin.flow.server.frontend.installer.ProxyConfig; import com.vaadin.flow.testcategory.SlowTests; diff --git a/flow-server/src/test/java/com/vaadin/flow/server/frontend/installer/NodeInstallerTest.java b/flow-server/src/test/java/com/vaadin/flow/server/frontend/installer/NodeInstallerTest.java index 2c85af9f99f..b5f65bdac4f 100644 --- a/flow-server/src/test/java/com/vaadin/flow/server/frontend/installer/NodeInstallerTest.java +++ b/flow-server/src/test/java/com/vaadin/flow/server/frontend/installer/NodeInstallerTest.java @@ -37,9 +37,10 @@ import org.mockito.Mockito; import com.vaadin.flow.internal.FrontendVersion; +import com.vaadin.flow.internal.Platform; import com.vaadin.flow.server.frontend.FrontendTools; -import static com.vaadin.flow.server.frontend.installer.Platform.ALPINE_RELEASE_FILE_PATH; +import static com.vaadin.flow.internal.Platform.ALPINE_RELEASE_FILE_PATH; public class NodeInstallerTest { diff --git a/flow-test-generic/src/main/java/com/vaadin/flow/testutil/ClassesSerializableTest.java b/flow-test-generic/src/main/java/com/vaadin/flow/testutil/ClassesSerializableTest.java index 229574fc859..635988cb153 100644 --- a/flow-test-generic/src/main/java/com/vaadin/flow/testutil/ClassesSerializableTest.java +++ b/flow-test-generic/src/main/java/com/vaadin/flow/testutil/ClassesSerializableTest.java @@ -268,7 +268,7 @@ protected Stream getExcludedPatterns() { "com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.FileDownloader(\\$.*)?", "com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.NodeInstaller", "com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.NodeInstaller\\$InstallData", - "com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.Platform", + "com\\.vaadin\\.flow\\.internal\\.Platform", "com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.ProxyConfig\\$Proxy", "com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.ProxyConfig", "com\\.vaadin\\.flow\\.server\\.frontend\\.ProxyFactory", diff --git a/flow-test-util/src/main/java/com/vaadin/flow/testutil/net/PortProber.java b/flow-test-util/src/main/java/com/vaadin/flow/testutil/net/PortProber.java index e5dcbcd8d9d..c84b8de1c77 100644 --- a/flow-test-util/src/main/java/com/vaadin/flow/testutil/net/PortProber.java +++ b/flow-test-util/src/main/java/com/vaadin/flow/testutil/net/PortProber.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.vaadin.flow.server.frontend.installer.Platform; +import com.vaadin.flow.internal.Platform; /** * Class for determining a free localhost port that is not used by any ipv4 or