diff --git a/sync/src/main.py b/sync/src/main.py index 926269e..f56fd51 100644 --- a/sync/src/main.py +++ b/sync/src/main.py @@ -6,9 +6,7 @@ from pathlib import Path from config import parse_config, Configuration, MavenMirrors, Package from gradle import create_gradle -from maven import get_effective_packages -from maven.plugins import get_effective_plugins -from maven.version import resolve_version +from maven import get_effective_packages, get_effective_plugins, resolve_version logger = logging.getLogger(__name__) diff --git a/sync/src/maven/__init__.py b/sync/src/maven/__init__.py index 27310b3..1121e3d 100644 --- a/sync/src/maven/__init__.py +++ b/sync/src/maven/__init__.py @@ -1 +1,3 @@ from .packages import get_effective_packages +from .plugins import get_effective_plugins +from .version import resolve_version diff --git a/sync/src/maven/fetch.py b/sync/src/maven/fetch.py index 20335df..3f02878 100644 --- a/sync/src/maven/fetch.py +++ b/sync/src/maven/fetch.py @@ -4,8 +4,8 @@ from aiohttp import ClientSession from typing import Optional, Iterable from config import Package -from maven.metadata import MavenMetadata -from pom import PackagePOM +from .metadata import MavenMetadata +from .pom import PackagePOM logger = logging.getLogger(__name__) diff --git a/sync/src/maven/packages.py b/sync/src/maven/packages.py index c19eec9..bc20590 100644 --- a/sync/src/maven/packages.py +++ b/sync/src/maven/packages.py @@ -3,9 +3,9 @@ import logging from typing import Optional, Iterable from config import Package, MavenMirrors -from maven.fetch import fetch_pom -from maven.version import resolve_version -from pom import PropertyMissing, Properties +from .fetch import fetch_pom +from .version import resolve_version +from .pom import PropertyMissing, Properties logger = logging.getLogger(__name__) diff --git a/sync/src/maven/plugins.py b/sync/src/maven/plugins.py index 41069b1..de619fc 100644 --- a/sync/src/maven/plugins.py +++ b/sync/src/maven/plugins.py @@ -1,7 +1,7 @@ import dataclasses from config import Plugin, MavenMirrors -from maven.version import resolve_version +from .version import resolve_version async def get_effective_plugins(plugin: Plugin, mirrors: MavenMirrors) -> list[Plugin]: diff --git a/sync/src/pom.py b/sync/src/maven/pom.py similarity index 100% rename from sync/src/pom.py rename to sync/src/maven/pom.py diff --git a/sync/src/maven/version.py b/sync/src/maven/version.py index 1bd442e..cde54d9 100644 --- a/sync/src/maven/version.py +++ b/sync/src/maven/version.py @@ -2,7 +2,7 @@ import logging from typing import Iterable from config import Package -from maven.fetch import fetch_metadata +from .fetch import fetch_metadata logger = logging.getLogger(__name__)