| @@ -6,9 +6,7 @@ from pathlib import Path | |||||
| from config import parse_config, Configuration, MavenMirrors, Package | from config import parse_config, Configuration, MavenMirrors, Package | ||||
| from gradle import create_gradle | 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__) | logger = logging.getLogger(__name__) | ||||
| @@ -1 +1,3 @@ | |||||
| from .packages import get_effective_packages | from .packages import get_effective_packages | ||||
| from .plugins import get_effective_plugins | |||||
| from .version import resolve_version | |||||
| @@ -4,8 +4,8 @@ from aiohttp import ClientSession | |||||
| from typing import Optional, Iterable | from typing import Optional, Iterable | ||||
| from config import Package | 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__) | logger = logging.getLogger(__name__) | ||||
| @@ -3,9 +3,9 @@ import logging | |||||
| from typing import Optional, Iterable | from typing import Optional, Iterable | ||||
| from config import Package, MavenMirrors | 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__) | logger = logging.getLogger(__name__) | ||||
| @@ -1,7 +1,7 @@ | |||||
| import dataclasses | import dataclasses | ||||
| from config import Plugin, MavenMirrors | 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]: | async def get_effective_plugins(plugin: Plugin, mirrors: MavenMirrors) -> list[Plugin]: | ||||
| @@ -2,7 +2,7 @@ import logging | |||||
| from typing import Iterable | from typing import Iterable | ||||
| from config import Package | from config import Package | ||||
| from maven.fetch import fetch_metadata | |||||
| from .fetch import fetch_metadata | |||||
| logger = logging.getLogger(__name__) | logger = logging.getLogger(__name__) | ||||