From eefd83f997b693838b9466510206861717417280 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Wed, 12 Oct 2022 23:57:42 +0300 Subject: [PATCH 01/31] upd atomatr ci --- ...er_not_on_gh.py => gradle_pkgver_notag.py} | 30 ++++---- .../workflows/{pipe.yaml => gradle_ci.yaml} | 73 +++++++------------ build.gradle.kts | 2 +- update_deps.py | 12 +++ update_deps.sh | 4 +- 5 files changed, 58 insertions(+), 63 deletions(-) rename .github/{gradle_pkgver_not_on_gh.py => gradle_pkgver_notag.py} (77%) rename .github/workflows/{pipe.yaml => gradle_ci.yaml} (72%) create mode 100755 update_deps.py diff --git a/.github/gradle_pkgver_not_on_gh.py b/.github/gradle_pkgver_notag.py similarity index 77% rename from .github/gradle_pkgver_not_on_gh.py rename to .github/gradle_pkgver_notag.py index b2af09a..067a0b8 100644 --- a/.github/gradle_pkgver_not_on_gh.py +++ b/.github/gradle_pkgver_notag.py @@ -1,19 +1,14 @@ -################################################################################ -# -# BEFORE EDITING MAKE SURE THIS IS NOT A SYNCED COPY -# -################################################################################ - import os.path import re import subprocess import sys -def _release_exists(ver: str) -> bool: - """Возвращает `true`, если репозитории гитхаба, соответствующем текущему `.git`, - уже существует релиз версии `ver`.""" +def _gh_release_exists(ver: str) -> bool: # не используется с 2022-10 + """Возвращает `true`, если репозитории гитхаба, соответствующем текущему + `.git`, уже существует релиз версии `ver`. """ try: + # todo проверять те subprocess.check_output(["gh", "release", "view", ver], stderr=subprocess.STDOUT) return True @@ -23,7 +18,12 @@ def _release_exists(ver: str) -> bool: raise -def _current_pkgver() -> str: +def _git_tag_exists(tag: str) -> bool: + return subprocess.check_output(["git", "tag", "-l", tag]) \ + .decode().strip() != "" + + +def _gradle_pkgver() -> str: """Полагаем, что в Gradle определён таск "pkgver", который печатает текущую версию пакета. Запускаем Gradle, выясняем версию, возвращаем её.""" ver = subprocess.check_output( @@ -34,7 +34,7 @@ def _current_pkgver() -> str: return ver -def target_version_to_stdout(): +def _print_unique_pkgver_or_throw(): """Позволяет определить, готовы ли мы опубликовать текущий проект Gradle в качестве релиза на GitHub. @@ -47,12 +47,12 @@ def target_version_to_stdout(): Эта функция может использоваться и непосредственно перед публикацией - и как предварительная проверка (чтобы не затевать долгий билд). """ - ver = _current_pkgver() - if _release_exists(ver): - print(f"Release {ver} already exists") + ver = _gradle_pkgver() + if _git_tag_exists(ver): + print(f"Tag {ver} already exists") sys.exit(1) print(ver) if __name__ == "__main__": - target_version_to_stdout() + _print_unique_pkgver_or_throw() diff --git a/.github/workflows/pipe.yaml b/.github/workflows/gradle_ci.yaml similarity index 72% rename from .github/workflows/pipe.yaml rename to .github/workflows/gradle_ci.yaml index 01b5b72..7d450e3 100644 --- a/.github/workflows/pipe.yaml +++ b/.github/workflows/gradle_ci.yaml @@ -1,12 +1,7 @@ ################################################################################ -# -# BEFORE EDITING MAKE SURE THIS IS NOT A SYNCED COPY -# +# 2022-10-12 23:57 | DO NOT EDIT. GENERATED BY ATOMATR ################################################################################ -# Этот скрипт опционально готов публиковать релиз в Maven Central. Пока он -# не получит команду на публикацию, он не будет проверять наличие реквизитов. - name: Gradle Pipe on: @@ -17,7 +12,6 @@ on: - '**.txt' - '.github/badges/**.svg' -# This allows a subsequently queued workflow run to interrupt previous runs concurrency: group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' cancel-in-progress: true @@ -37,7 +31,7 @@ jobs: strategy: matrix: - os: [ ubuntu-latest ] # windows-latest + os: [ ubuntu-latest ] jdk_version: [ 8, 18 ] steps: @@ -58,7 +52,7 @@ jobs: strategy: matrix: - os: [ ubuntu-latest ] # windows-latest + os: [ ubuntu-latest ] steps: - uses: actions/checkout@v2 @@ -83,18 +77,14 @@ jobs: python test_as_git_module.py dev check-version: - # Узнаёт версию Java-пакета и запоминает её на случай релиза. - # - # После релиза в гитхаб считаем недопустимыми существования вариаций кода - # с той же версией. Даже тесты будем считать несостоявшимися. Так мы будем - # уверены, что любой прошедший тесты код можно зарелизить. + runs-on: ubuntu-latest outputs: version: ${{ steps.get_version.outputs.result }} steps: - uses: actions/checkout@v3 - name: Setup JDK - # Java понадобится, чтобы из Gradle получить номер релиза. + uses: actions/setup-java@v2 with: java-version: '8' @@ -106,29 +96,10 @@ jobs: python-version: '3.10' - name: Get the project version id: get_version - run: echo "::set-output name=result::$(python .github/gradle_pkgver_not_on_gh.py)" + run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - assert-sonatype-credentials-set: - # это мы проверяем не всегда, а только перед релизом. Но быстро и сразу - needs: [ release-flag ] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Check variables - run: | - if [ -z "$MAVEN_GPG_KEY" ]; then exit 1; fi - if [ -z "$MAVEN_GPG_PASSWORD" ]; then exit 1; fi - if [ -z "$SONATYPE_USERNAME" ]; then exit 1; fi - if [ -z "$SONATYPE_PASSWORD" ]; then exit 1; fi - env: - MAVEN_GPG_KEY: ${{ secrets.MAVEN_GPG_KEY }} - MAVEN_GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSWORD }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - - to-staging: needs: [ unit-test, test-dev-as-module-from-git, check-version ] runs-on: ubuntu-latest @@ -153,10 +124,8 @@ jobs: target_branch: master github_token: ${{ github.token }} - ## GITHUB RELEASE AND PACKAGE ################################################ - to-github-release: - needs: [ to-staging, release-flag, check-version, assert-sonatype-credentials-set ] + needs: [ to-staging, release-flag, check-version ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -164,16 +133,14 @@ jobs: id: publish_github_release uses: softprops/action-gh-release@v1 with: - # тег для релиза мы давно выяснили + tag_name: ${{ needs.check-version.outputs.version }} files: ./build/libs/*.jar env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} to-github-package: - # Полагаем, что без токенов наш Gradle публиковать не умеет никуда. - # А в данном случае мы ему даём GITHUB_PKGPUB_TOKEN, и он сориентируется, - # что публикуем в GitHub Packages + needs: [ to-github-release ] runs-on: ubuntu-latest steps: @@ -188,12 +155,27 @@ jobs: run: ./gradlew publish env: - # the secrets.GITHUB_TOKEN is predefined + GITHUB_PKGPUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + assert-sonatype-credentials-set: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Check variables + run: | + if [ -z "$MAVEN_GPG_KEY" ]; then exit 1; fi + if [ -z "$MAVEN_GPG_PASSWORD" ]; then exit 1; fi + if [ -z "$SONATYPE_USERNAME" ]; then exit 1; fi + if [ -z "$SONATYPE_PASSWORD" ]; then exit 1; fi + env: + MAVEN_GPG_KEY: ${{ secrets.MAVEN_GPG_KEY }} + MAVEN_GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSWORD }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} to-maven-central-package: - needs: [ to-github-release ] + needs: [ to-github-release, assert-sonatype-credentials-set ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -210,4 +192,5 @@ jobs: MAVEN_GPG_KEY: ${{ secrets.MAVEN_GPG_KEY }} MAVEN_GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} \ No newline at end of file + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 529b3c7..1403c49 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ plugins { } group = "io.github.rtmigo" -version = "0.1.0-dev18" +version = "0.1.0-dev19" tasks.register("pkgver") { doLast { diff --git a/update_deps.py b/update_deps.py new file mode 100755 index 0000000..69f2266 --- /dev/null +++ b/update_deps.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python3 + +from atomatr import update_gradle_ci +from pathlib import Path + + +def update(): + update_gradle_ci(Path(__file__).parent, maven_central=True) + + +if __name__ == "__main__": + update() diff --git a/update_deps.sh b/update_deps.sh index dcabe0f..94ef35a 100755 --- a/update_deps.sh +++ b/update_deps.sh @@ -1,3 +1,3 @@ -hubget https://github.com/rtmigo/cicd/blob/dev/gradle/pipe.yaml .github/workflows/ +#hubget https://github.com/rtmigo/cicd/blob/dev/gradle/pipe.yaml .github/workflows/ #hubget https://github.com/rtmigo/cicd/blob/dev/gradle/on_release_pub_gh.yaml .github/workflows/ -hubget https://github.com/rtmigo/cicd/blob/dev/gradle/gradle_pkgver_not_on_gh.py .github/ \ No newline at end of file +#hubget https://github.com/rtmigo/cicd/blob/dev/gradle/gradle_pkgver_not_on_gh.py .github/ \ No newline at end of file From 3ddf5a0571e39bf43c6afe6017a57d395dba35e3 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 00:00:50 +0300 Subject: [PATCH 02/31] upd atomatr ci --- .github/workflows/gradle_ci.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle_ci.yaml b/.github/workflows/gradle_ci.yaml index 7d450e3..5d3f715 100644 --- a/.github/workflows/gradle_ci.yaml +++ b/.github/workflows/gradle_ci.yaml @@ -1,5 +1,5 @@ ################################################################################ -# 2022-10-12 23:57 | DO NOT EDIT. GENERATED BY ATOMATR +# 2022-10-13 00:00 | DO NOT EDIT. GENERATED BY ATOMATR ################################################################################ name: Gradle Pipe @@ -78,6 +78,7 @@ jobs: check-version: + needs: [release-flag] runs-on: ubuntu-latest outputs: version: ${{ steps.get_version.outputs.result }} @@ -101,7 +102,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} to-staging: - needs: [ unit-test, test-dev-as-module-from-git, check-version ] + needs: [ unit-test, test-dev-as-module-from-git ] runs-on: ubuntu-latest steps: - uses: actions/checkout@master From 6c2a20e6370aa9633dbd2489bb31aad7d9ed3d8f Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 02:12:02 +0300 Subject: [PATCH 03/31] building .jar, sources.jar and javadoc.jar by python --- .github/gradle_pkgver_notag.py | 5 +- .github/workflows/gradle_ci.yaml | 2 +- README.md | 10 +-- masonpub/masonpub.dart | 15 ++++ masonpub/pubspec.yaml | 15 ++++ msnpub.py | 113 +++++++++++++++++++++++++++++++ settings.gradle.kts | 2 +- 7 files changed, 154 insertions(+), 8 deletions(-) create mode 100755 masonpub/masonpub.dart create mode 100644 masonpub/pubspec.yaml create mode 100644 msnpub.py diff --git a/.github/gradle_pkgver_notag.py b/.github/gradle_pkgver_notag.py index 067a0b8..3a9d50d 100644 --- a/.github/gradle_pkgver_notag.py +++ b/.github/gradle_pkgver_notag.py @@ -1,3 +1,7 @@ +################################################################################ +# 2022-10-13 00:08 | DO NOT EDIT. GENERATED BY ATOMATR +################################################################################ + import os.path import re import subprocess @@ -8,7 +12,6 @@ def _gh_release_exists(ver: str) -> bool: # не используется с 20 """Возвращает `true`, если репозитории гитхаба, соответствующем текущему `.git`, уже существует релиз версии `ver`. """ try: - # todo проверять те subprocess.check_output(["gh", "release", "view", ver], stderr=subprocess.STDOUT) return True diff --git a/.github/workflows/gradle_ci.yaml b/.github/workflows/gradle_ci.yaml index 5d3f715..e3a4210 100644 --- a/.github/workflows/gradle_ci.yaml +++ b/.github/workflows/gradle_ci.yaml @@ -1,5 +1,5 @@ ################################################################################ -# 2022-10-13 00:00 | DO NOT EDIT. GENERATED BY ATOMATR +# 2022-10-13 00:08 | DO NOT EDIT. GENERATED BY ATOMATR ################################################################################ name: Gradle Pipe diff --git a/README.md b/README.md index 6a1daf1..7057916 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ repositories { } dependencies { - implementation("io.github.rtmigo:precise:0.1.0") + implementation("io.github.rtmigo:precise-one:0.1.0") } ``` @@ -59,7 +59,7 @@ repositories { } dependencies { - implementation "io.github.rtmigo:precise:0.1.0" + implementation "io.github.rtmigo:precise-one:0.1.0" } ``` @@ -73,7 +73,7 @@ dependencies { io.github.rtmigo - precise + precise-one 0.1.0 @@ -88,7 +88,7 @@ dependencies { ```kotlin sourceControl { gitRepository(java.net.URI("https://github.com/rtmigo/precise_kt.git")) { - producesModule("io.github.rtmigo:precise") + producesModule("io.github.rtmigo:precise-one") } } ``` @@ -97,7 +97,7 @@ sourceControl { ```kotlin dependencies { - implementation("io.github.rtmigo:precise") { + implementation("io.github.rtmigo:precise-one") { version { branch = "staging" } } } diff --git a/masonpub/masonpub.dart b/masonpub/masonpub.dart new file mode 100755 index 0000000..459c27c --- /dev/null +++ b/masonpub/masonpub.dart @@ -0,0 +1,15 @@ +#!/usr/bin/env dart + +import 'dart:io'; + +void createDocs() { + final r = Process.runSync("./gradlew", ["clean", "dokkaHtml"]); + if (r.exitCode!=0) + throw "Bad exit code"; + + +} + +void main() { + createDocs(); +} \ No newline at end of file diff --git a/masonpub/pubspec.yaml b/masonpub/pubspec.yaml new file mode 100644 index 0000000..0ec0a53 --- /dev/null +++ b/masonpub/pubspec.yaml @@ -0,0 +1,15 @@ +name: masonpub +version: 0.0.0 + +environment: + sdk: '>=2.18.0 <3.0.0' + +dev_dependencies: + lints: ^2.0.0 + test: ^1.16.0 + +dependencies: + archive: ^3.3.1 + glob: ^2.1.0 + path: ^1.8.2 + diff --git a/msnpub.py b/msnpub.py new file mode 100644 index 0000000..19df7cc --- /dev/null +++ b/msnpub.py @@ -0,0 +1,113 @@ +# https://mccue.dev/pages/6-1-22-upload-to-maven-central?utm_source=pocket_mylist +import re +import shutil +import subprocess + +from pathlib import Path +from typing import NewType, NamedTuple, Iterable + + +def print_header(text: str): + print() + print("#" * 80) + print(" " + text.upper()) + print("#" * 80) + print() + + +ProjectDir = NewType('ProjectDir', Path) +PackageName = NewType('PackageName', str) +Version = NewType('Version', str) + + +def gradle(pd: ProjectDir) -> Path: + return pd / "gradlew" + + +def gradle_clean(pd: ProjectDir): + subprocess.check_call([gradle(pd), "clean"]) + + +def project_dir_to_dokka_dir(project: ProjectDir) -> Path: + return project / "build" / "dokka" / "html" + + +class PackageAttr(NamedTuple): + name: PackageName + version: Version + + +def docs_jar_basename(package: PackageName, version: Version) -> str: + return f"{package}-{version}-javadoc.jar" + + +def create_docs(pd: ProjectDir, attrs: PackageAttr, target_dir: Path): + print_header("Building javadoc.jar") + assert not project_dir_to_dokka_dir(pd).exists() + subprocess.check_call([gradle(pd), "dokkaHtml"]) + assert project_dir_to_dokka_dir(pd).exists() + subprocess.check_call( + ["jar", "--create", + "--file", target_dir / docs_jar_basename(attrs.name, attrs.version), + "-C", project_dir_to_dokka_dir(pd), "."]) + + +def create_classes_and_sources_jar(pd: ProjectDir) -> list[Path]: + print_header("Testing, building .jar and sources.jar") + subprocess.check_call([gradle(pd), "build"]) + results = list(pd.glob("build/libs/*.jar")) + assert len(results) == 2 + return results + + +def basename_to_name_ver(basename: str) -> PackageAttr[PackageName, Version]: + # и имя пакета, и версия могут включать дефисы + m = re.fullmatch(r"([-\w]+)-(\d.+)\.jar", basename) + return PackageAttr(PackageName(m.group(1)), Version(m.group(2))) + + +def shortest_basename(paths: Iterable[Path]) -> str: + return next(iter(sorted(paths, key=lambda f: len(f.name)))).name + + +# def first_file_by_glob(d: Path, glob: str) -> Path: +# for x in sorted(list(d.glob('*.jar'))): +# if x.is_file(): +# return x +# raise FileNotFoundError +# +# +# def dir_to_name_ver(d: Path) -> PackageAttr: +# return basename_to_name_ver(first_file_by_glob(d, "*.jar").name) + + +# print(get_name_ver("package-0.1.0.jar")) +assert basename_to_name_ver("package-0.1.0.jar") == ("package", "0.1.0") +assert basename_to_name_ver("package-one-0.1.0.jar") == ("package-one", "0.1.0") +assert basename_to_name_ver("package-one-0.1.0-beta1.jar") == ("package-one", "0.1.0-beta1") + + +# exit() + + +def goo(): + package = PackageName("stub") + version = Version("0.0.0") + project_dir = ProjectDir(Path(__file__).parent) + + deploy_dir = Path(__file__).parent / "tmp_deploy" + if deploy_dir.exists(): + shutil.rmtree(deploy_dir) + deploy_dir.mkdir() + + gradle_clean(project_dir) + jars = create_classes_and_sources_jar(project_dir) + attrs = basename_to_name_ver(shortest_basename(jars)) + + for jar in create_classes_and_sources_jar(project_dir): + jar.rename(deploy_dir / jar.name) + create_docs(project_dir, attrs, deploy_dir) + + +if __name__ == "__main__": + goo() diff --git a/settings.gradle.kts b/settings.gradle.kts index d82f529..2496bab 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,3 @@ -rootProject.name = "precise" +rootProject.name = "precise-one" //includeBuild("convention-plugins") //includeBuild("buildSrc") From 52fa9dd5f8dc32d679d236901307b1b23f6a65dc Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 02:54:37 +0300 Subject: [PATCH 04/31] built POM --- msnpub.py | 114 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 103 insertions(+), 11 deletions(-) diff --git a/msnpub.py b/msnpub.py index 19df7cc..53059cd 100644 --- a/msnpub.py +++ b/msnpub.py @@ -16,7 +16,8 @@ def print_header(text: str): ProjectDir = NewType('ProjectDir', Path) -PackageName = NewType('PackageName', str) +Artifact = NewType('PackageName', str) +Group = NewType('Group', str) Version = NewType('Version', str) @@ -33,11 +34,11 @@ def project_dir_to_dokka_dir(project: ProjectDir) -> Path: class PackageAttr(NamedTuple): - name: PackageName + artifact: Artifact version: Version -def docs_jar_basename(package: PackageName, version: Version) -> str: +def docs_jar_basename(package: Artifact, version: Version) -> str: return f"{package}-{version}-javadoc.jar" @@ -47,8 +48,7 @@ def create_docs(pd: ProjectDir, attrs: PackageAttr, target_dir: Path): subprocess.check_call([gradle(pd), "dokkaHtml"]) assert project_dir_to_dokka_dir(pd).exists() subprocess.check_call( - ["jar", "--create", - "--file", target_dir / docs_jar_basename(attrs.name, attrs.version), + ["jar", "--create", "--file", target_dir / docs_jar_basename(attrs.artifact, attrs.version), "-C", project_dir_to_dokka_dir(pd), "."]) @@ -60,14 +60,93 @@ def create_classes_and_sources_jar(pd: ProjectDir) -> list[Path]: return results -def basename_to_name_ver(basename: str) -> PackageAttr[PackageName, Version]: +def basename_to_name_ver(basename: str) -> PackageAttr[Artifact, Version]: # и имя пакета, и версия могут включать дефисы m = re.fullmatch(r"([-\w]+)-(\d.+)\.jar", basename) - return PackageAttr(PackageName(m.group(1)), Version(m.group(2))) + return PackageAttr(Artifact(m.group(1)), Version(m.group(2))) def shortest_basename(paths: Iterable[Path]) -> str: - return next(iter(sorted(paths, key=lambda f: len(f.name)))).name + return next(iter(sorted(paths, key=lambda f: len(f.artifact)))).name + + +class GithubRepo(NamedTuple): + owner: str + repo: str + branch: str + + +class Developer(NamedTuple): + name: str + email: str + organization: str + organization_url: str + + +class Pom(NamedTuple): + group: Group + artifact: Artifact + description: str + + license_name: str + github: GithubRepo + devs: list[Developer] + name: str | None = None # по умолчанию возьмём artifact + homepage: str | None = None # по умолчанию возьмём страницу гитхаба + + +def create_pom_xml(pom: Pom, version: Version, target_dir: Path): + print_header("Creating POM") + + # здесь мы сделали допущение, что репозиторий точно на GitHub, а разработчик один + if len(pom.devs) != 1: + raise ValueError + + def github_url(r: GithubRepo): + return f"https://github.com/{r.owner}/{r.repo}" + + xml = f""" + + + 4.0.0 + + {pom.group} + {pom.artifact} + {version} + jar + + {pom.name or pom.artifact} + {pom.description} + {pom.homepage or github_url(pom.github)} + + + + {pom.license_name} + https://github.com/{pom.github.owner}/{pom.github.repo}/blob/{pom.github.branch}/LICENSE + + + + + + {pom.devs[0].name} + {pom.devs[0].email} + {pom.devs[0].organization} + {pom.devs[0].organization_url} + + + + + scm:git:git://github.com/{pom.github.owner}/{pom.github.repo}.git + scm:git:ssh://github.com:{pom.github.owner}/{pom.github.repo}.git + https://github.com/{pom.github.owner}/{pom.github.repo}/tree/{pom.github.branch} + + + """ + + basename = f"{pom.artifact}-{version}.pom" + (target_dir / basename).write_text(xml.strip()) # def first_file_by_glob(d: Path, glob: str) -> Path: @@ -90,8 +169,8 @@ def shortest_basename(paths: Iterable[Path]) -> str: # exit() -def goo(): - package = PackageName("stub") +def goo(pom: Pom): + package = Artifact("stub") version = Version("0.0.0") project_dir = ProjectDir(Path(__file__).parent) @@ -104,10 +183,23 @@ def goo(): jars = create_classes_and_sources_jar(project_dir) attrs = basename_to_name_ver(shortest_basename(jars)) + if attrs.artifact!=pom.artifact: + raise ValueError(f"Artifact mismatch: POM '{pom.artifact}', built '{attrs.artifact}'") + for jar in create_classes_and_sources_jar(project_dir): jar.rename(deploy_dir / jar.name) create_docs(project_dir, attrs, deploy_dir) + create_pom_xml(pom, attrs.version, deploy_dir) + + assert len(list(deploy_dir.glob("*"))) == 4 if __name__ == "__main__": - goo() + goo(Pom(group=Group("io.github.rtmigo"), artifact=Artifact("precise"), + description="Kotlin/JVM compensated summation of Double sequences " + "to calculate sum, mean, standard deviation", license_name="MIT License", + github=GithubRepo(owner="rtmigo", repo="precise_kt", branch="master"), devs=[ + Developer(name="Artsiom iG", email="ortemeo@gmail.com", organization="Revercode", + organization_url="https://revercode.com")])) + + From 6f91b79c325fdb591aae585248c4ffdbf4799b51 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 05:31:58 +0300 Subject: [PATCH 05/31] testing rtmaven --- .github/workflows/maven.yaml | 33 ++++++ README.md | 10 +- masonpub/masonpub.dart | 15 --- masonpub/pubspec.yaml | 15 --- msnpub.py | 214 +++-------------------------------- settings.gradle.kts | 2 +- 6 files changed, 52 insertions(+), 237 deletions(-) create mode 100644 .github/workflows/maven.yaml delete mode 100755 masonpub/masonpub.dart delete mode 100644 masonpub/pubspec.yaml diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml new file mode 100644 index 0000000..83732c1 --- /dev/null +++ b/.github/workflows/maven.yaml @@ -0,0 +1,33 @@ +name: Maven Tst + +on: + push: + branches: [ dev ] + paths-ignore: + - '**.md' + - '**.txt' + - '.github/badges/**.svg' + + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 +# - name: Setup JDK +# uses: actions/setup-java@v2 +# with: +# java-version: '8' +# distribution: 'temurin' +# cache: gradle + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.10' + + - name: Set up RtMaven + run: pip install https://github.com/rtmigo/rtmaven_py + +# - name: Get the project version +# id: get_version +# run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/README.md b/README.md index 7057916..6a1daf1 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ repositories { } dependencies { - implementation("io.github.rtmigo:precise-one:0.1.0") + implementation("io.github.rtmigo:precise:0.1.0") } ``` @@ -59,7 +59,7 @@ repositories { } dependencies { - implementation "io.github.rtmigo:precise-one:0.1.0" + implementation "io.github.rtmigo:precise:0.1.0" } ``` @@ -73,7 +73,7 @@ dependencies { io.github.rtmigo - precise-one + precise 0.1.0 @@ -88,7 +88,7 @@ dependencies { ```kotlin sourceControl { gitRepository(java.net.URI("https://github.com/rtmigo/precise_kt.git")) { - producesModule("io.github.rtmigo:precise-one") + producesModule("io.github.rtmigo:precise") } } ``` @@ -97,7 +97,7 @@ sourceControl { ```kotlin dependencies { - implementation("io.github.rtmigo:precise-one") { + implementation("io.github.rtmigo:precise") { version { branch = "staging" } } } diff --git a/masonpub/masonpub.dart b/masonpub/masonpub.dart deleted file mode 100755 index 459c27c..0000000 --- a/masonpub/masonpub.dart +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env dart - -import 'dart:io'; - -void createDocs() { - final r = Process.runSync("./gradlew", ["clean", "dokkaHtml"]); - if (r.exitCode!=0) - throw "Bad exit code"; - - -} - -void main() { - createDocs(); -} \ No newline at end of file diff --git a/masonpub/pubspec.yaml b/masonpub/pubspec.yaml deleted file mode 100644 index 0ec0a53..0000000 --- a/masonpub/pubspec.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: masonpub -version: 0.0.0 - -environment: - sdk: '>=2.18.0 <3.0.0' - -dev_dependencies: - lints: ^2.0.0 - test: ^1.16.0 - -dependencies: - archive: ^3.3.1 - glob: ^2.1.0 - path: ^1.8.2 - diff --git a/msnpub.py b/msnpub.py index 53059cd..2a05abf 100644 --- a/msnpub.py +++ b/msnpub.py @@ -1,205 +1,17 @@ -# https://mccue.dev/pages/6-1-22-upload-to-maven-central?utm_source=pocket_mylist -import re -import shutil -import subprocess - from pathlib import Path -from typing import NewType, NamedTuple, Iterable - - -def print_header(text: str): - print() - print("#" * 80) - print(" " + text.upper()) - print("#" * 80) - print() - - -ProjectDir = NewType('ProjectDir', Path) -Artifact = NewType('PackageName', str) -Group = NewType('Group', str) -Version = NewType('Version', str) - - -def gradle(pd: ProjectDir) -> Path: - return pd / "gradlew" - - -def gradle_clean(pd: ProjectDir): - subprocess.check_call([gradle(pd), "clean"]) - - -def project_dir_to_dokka_dir(project: ProjectDir) -> Path: - return project / "build" / "dokka" / "html" - - -class PackageAttr(NamedTuple): - artifact: Artifact - version: Version - - -def docs_jar_basename(package: Artifact, version: Version) -> str: - return f"{package}-{version}-javadoc.jar" - - -def create_docs(pd: ProjectDir, attrs: PackageAttr, target_dir: Path): - print_header("Building javadoc.jar") - assert not project_dir_to_dokka_dir(pd).exists() - subprocess.check_call([gradle(pd), "dokkaHtml"]) - assert project_dir_to_dokka_dir(pd).exists() - subprocess.check_call( - ["jar", "--create", "--file", target_dir / docs_jar_basename(attrs.artifact, attrs.version), - "-C", project_dir_to_dokka_dir(pd), "."]) - - -def create_classes_and_sources_jar(pd: ProjectDir) -> list[Path]: - print_header("Testing, building .jar and sources.jar") - subprocess.check_call([gradle(pd), "build"]) - results = list(pd.glob("build/libs/*.jar")) - assert len(results) == 2 - return results - - -def basename_to_name_ver(basename: str) -> PackageAttr[Artifact, Version]: - # и имя пакета, и версия могут включать дефисы - m = re.fullmatch(r"([-\w]+)-(\d.+)\.jar", basename) - return PackageAttr(Artifact(m.group(1)), Version(m.group(2))) - - -def shortest_basename(paths: Iterable[Path]) -> str: - return next(iter(sorted(paths, key=lambda f: len(f.artifact)))).name - - -class GithubRepo(NamedTuple): - owner: str - repo: str - branch: str - - -class Developer(NamedTuple): - name: str - email: str - organization: str - organization_url: str - - -class Pom(NamedTuple): - group: Group - artifact: Artifact - description: str - - license_name: str - github: GithubRepo - devs: list[Developer] - name: str | None = None # по умолчанию возьмём artifact - homepage: str | None = None # по умолчанию возьмём страницу гитхаба - - -def create_pom_xml(pom: Pom, version: Version, target_dir: Path): - print_header("Creating POM") - - # здесь мы сделали допущение, что репозиторий точно на GitHub, а разработчик один - if len(pom.devs) != 1: - raise ValueError - - def github_url(r: GithubRepo): - return f"https://github.com/{r.owner}/{r.repo}" - - xml = f""" - - - 4.0.0 - - {pom.group} - {pom.artifact} - {version} - jar - - {pom.name or pom.artifact} - {pom.description} - {pom.homepage or github_url(pom.github)} - - - - {pom.license_name} - https://github.com/{pom.github.owner}/{pom.github.repo}/blob/{pom.github.branch}/LICENSE - - - - - - {pom.devs[0].name} - {pom.devs[0].email} - {pom.devs[0].organization} - {pom.devs[0].organization_url} - - - - - scm:git:git://github.com/{pom.github.owner}/{pom.github.repo}.git - scm:git:ssh://github.com:{pom.github.owner}/{pom.github.repo}.git - https://github.com/{pom.github.owner}/{pom.github.repo}/tree/{pom.github.branch} - - - """ - - basename = f"{pom.artifact}-{version}.pom" - (target_dir / basename).write_text(xml.strip()) - - -# def first_file_by_glob(d: Path, glob: str) -> Path: -# for x in sorted(list(d.glob('*.jar'))): -# if x.is_file(): -# return x -# raise FileNotFoundError -# -# -# def dir_to_name_ver(d: Path) -> PackageAttr: -# return basename_to_name_ver(first_file_by_glob(d, "*.jar").name) - - -# print(get_name_ver("package-0.1.0.jar")) -assert basename_to_name_ver("package-0.1.0.jar") == ("package", "0.1.0") -assert basename_to_name_ver("package-one-0.1.0.jar") == ("package-one", "0.1.0") -assert basename_to_name_ver("package-one-0.1.0-beta1.jar") == ("package-one", "0.1.0-beta1") - - -# exit() - - -def goo(pom: Pom): - package = Artifact("stub") - version = Version("0.0.0") - project_dir = ProjectDir(Path(__file__).parent) - - deploy_dir = Path(__file__).parent / "tmp_deploy" - if deploy_dir.exists(): - shutil.rmtree(deploy_dir) - deploy_dir.mkdir() - - gradle_clean(project_dir) - jars = create_classes_and_sources_jar(project_dir) - attrs = basename_to_name_ver(shortest_basename(jars)) - - if attrs.artifact!=pom.artifact: - raise ValueError(f"Artifact mismatch: POM '{pom.artifact}', built '{attrs.artifact}'") - - for jar in create_classes_and_sources_jar(project_dir): - jar.rename(deploy_dir / jar.name) - create_docs(project_dir, attrs, deploy_dir) - create_pom_xml(pom, attrs.version, deploy_dir) - - assert len(list(deploy_dir.glob("*"))) == 4 - +from rtmaven import maven_release_to_dir, Group, Artifact, Pom, GithubRepo, Developer if __name__ == "__main__": - goo(Pom(group=Group("io.github.rtmigo"), artifact=Artifact("precise"), + maven_release_to_dir( + Pom(group=Group("io.github.rtmigo"), + artifact=Artifact("precise"), description="Kotlin/JVM compensated summation of Double sequences " - "to calculate sum, mean, standard deviation", license_name="MIT License", - github=GithubRepo(owner="rtmigo", repo="precise_kt", branch="master"), devs=[ - Developer(name="Artsiom iG", email="ortemeo@gmail.com", organization="Revercode", - organization_url="https://revercode.com")])) - - + "to calculate sum, mean, standard deviation", + license_name="MIT License", + github=GithubRepo(owner="rtmigo", repo="precise_kt", branch="master"), + devs=[Developer( + name="Artsiom iG", + email="ortemeo@gmail.com", + organization="Revercode", + organization_url="https://revercode.com")]), + deploy_dir=Path(__file__).parent / "build" / "rtmaven") diff --git a/settings.gradle.kts b/settings.gradle.kts index 2496bab..d82f529 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,3 @@ -rootProject.name = "precise-one" +rootProject.name = "precise" //includeBuild("convention-plugins") //includeBuild("buildSrc") From 0c93cf27dd6c6c7f7328f7beb197f8f952c1198d Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 05:32:29 +0300 Subject: [PATCH 06/31] testing rtmaven --- .github/workflows/maven.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 83732c1..e7a3b37 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -8,6 +8,7 @@ on: - '**.txt' - '.github/badges/**.svg' +jobs: build: runs-on: ubuntu-latest steps: From d0ca89a8d8415d1b2899db5094f7f391a45e17d8 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 05:34:17 +0300 Subject: [PATCH 07/31] testing rtmaven --- .github/workflows/maven.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index e7a3b37..6e50f68 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -25,7 +25,9 @@ jobs: python-version: '3.10' - name: Set up RtMaven - run: pip install https://github.com/rtmigo/rtmaven_py + run: | + git config --global url."https://${{ secrets.GITHUB_TOKEN }}@github".insteadOf https://github + pip install https://github.com/rtmigo/rtmaven_py # - name: Get the project version # id: get_version From 3d73cd07d9ae17679dd18bf2a01da8069cc806a2 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 05:40:41 +0300 Subject: [PATCH 08/31] testing rtmaven --- .github/workflows/maven.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 6e50f68..0a5f0a5 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -26,7 +26,6 @@ jobs: - name: Set up RtMaven run: | - git config --global url."https://${{ secrets.GITHUB_TOKEN }}@github".insteadOf https://github pip install https://github.com/rtmigo/rtmaven_py # - name: Get the project version From 4eba2b23060602fc17c1f230866301b1f5dc3462 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 05:41:36 +0300 Subject: [PATCH 09/31] testing rtmaven --- .github/workflows/maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 0a5f0a5..37d6eb8 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -26,7 +26,7 @@ jobs: - name: Set up RtMaven run: | - pip install https://github.com/rtmigo/rtmaven_py + pip install git+https://github.com/rtmigo/rtmaven_py # - name: Get the project version # id: get_version From 0e88069c63d53876b89e1b2ba8a3896fda61c837 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 05:42:42 +0300 Subject: [PATCH 10/31] testing rtmaven --- .github/workflows/maven.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 37d6eb8..d2ac20e 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -28,6 +28,10 @@ jobs: run: | pip install git+https://github.com/rtmigo/rtmaven_py + - name: build + run: python msnpub.py + + # - name: Get the project version # id: get_version # run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" From 712d0550725bebbeead72352526393595b93d10a Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 05:46:12 +0300 Subject: [PATCH 11/31] testing rtmaven --- .github/workflows/maven.yaml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index d2ac20e..50a7793 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -8,17 +8,20 @@ on: - '**.txt' - '.github/badges/**.svg' +concurrency: + cancel-in-progress: true + jobs: build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 -# - name: Setup JDK -# uses: actions/setup-java@v2 -# with: -# java-version: '8' -# distribution: 'temurin' -# cache: gradle + - name: Setup JDK + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'temurin' + cache: gradle - name: Set up Python uses: actions/setup-python@v4 with: @@ -30,6 +33,11 @@ jobs: - name: build run: python msnpub.py + env: + MAVEN_GPG_KEY: ${{ secrets.MAVEN_GPG_KEY }} + MAVEN_GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSWORD }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} # - name: Get the project version From 4e63450aa4d4361072c4131129af6253dd6a3c4f Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 05:47:01 +0300 Subject: [PATCH 12/31] testing rtmaven --- .github/workflows/maven.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 50a7793..45ed7a1 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -9,6 +9,7 @@ on: - '.github/badges/**.svg' concurrency: + group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}' cancel-in-progress: true jobs: From 469ccabe2263bb16174a638a51fcf9812c9f84fd Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 05:57:41 +0300 Subject: [PATCH 13/31] testing rtmaven --- .github/workflows/maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 45ed7a1..dfacafe 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -45,4 +45,4 @@ jobs: # id: get_version # run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" # env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From e9251acbd7a83b13041e3dde83c2d81add3d8a98 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 06:08:29 +0300 Subject: [PATCH 14/31] testing rtmaven --- .github/workflows/maven.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index dfacafe..bc53043 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -46,3 +46,4 @@ jobs: # run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + From ab49666fbf57b21d80a1bc1774340683c51451d8 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 06:31:03 +0300 Subject: [PATCH 15/31] testing rtmaven --- .github/workflows/maven.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index bc53043..dfacafe 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -46,4 +46,3 @@ jobs: # run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - From 8ced172caabaa998337f0892a71a63bd3e9ab0f6 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 06:38:31 +0300 Subject: [PATCH 16/31] testing rtmaven --- .github/workflows/maven.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index dfacafe..a0da49a 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -40,7 +40,6 @@ jobs: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - # - name: Get the project version # id: get_version # run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" From 7ce1804c32d89eb1d51c01a44b1be0a867b6fb0a Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 06:44:02 +0300 Subject: [PATCH 17/31] testing rtmaven --- .github/workflows/maven.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index a0da49a..b3d37a0 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -45,3 +45,4 @@ jobs: # run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + From 0d9b329b2810aea272b49434877d776e38b4d17f Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 06:48:32 +0300 Subject: [PATCH 18/31] testing rtmaven --- .github/workflows/maven.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index b3d37a0..807ab28 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -33,7 +33,9 @@ jobs: pip install git+https://github.com/rtmigo/rtmaven_py - name: build - run: python msnpub.py + run: | + export GPG_TTY=$(tty) + python msnpub.py env: MAVEN_GPG_KEY: ${{ secrets.MAVEN_GPG_KEY }} MAVEN_GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSWORD }} From fd6ac95ac0dcf976c7c408c70bdc6c890c29ce15 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 06:53:37 +0300 Subject: [PATCH 19/31] testing rtmaven --- .github/workflows/maven.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 807ab28..4b96ef0 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -47,4 +47,3 @@ jobs: # run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - From f6393a0b8de8c33f4dd936e6a48c1f5515715b15 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 06:56:53 +0300 Subject: [PATCH 20/31] testing rtmaven --- .github/workflows/maven.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 4b96ef0..807ab28 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -47,3 +47,4 @@ jobs: # run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + From d35cfeaaaa3ac4a59dfcfa53156da5002247feef Mon Sep 17 00:00:00 2001 From: Artem IG Date: Thu, 13 Oct 2022 07:06:52 +0300 Subject: [PATCH 21/31] testing rtmaven --- .github/workflows/maven.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 807ab28..08036d0 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -42,6 +42,7 @@ jobs: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + # - name: Get the project version # id: get_version # run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" From b450f275af3d181f93a3fd85d39ea33cb1f23fd9 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Fri, 14 Oct 2022 02:57:05 +0300 Subject: [PATCH 22/31] testing rtmaven --- msnpub.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/msnpub.py b/msnpub.py index 2a05abf..781f14b 100644 --- a/msnpub.py +++ b/msnpub.py @@ -1,17 +1,19 @@ from pathlib import Path -from rtmaven import maven_release_to_dir, Group, Artifact, Pom, GithubRepo, Developer +from rtmaven import maven_release_to_dir, Group, Artifact, ProjectMeta, GithubRepo, Developer if __name__ == "__main__": maven_release_to_dir( - Pom(group=Group("io.github.rtmigo"), - artifact=Artifact("precise"), - description="Kotlin/JVM compensated summation of Double sequences " - "to calculate sum, mean, standard deviation", - license_name="MIT License", - github=GithubRepo(owner="rtmigo", repo="precise_kt", branch="master"), - devs=[Developer( - name="Artsiom iG", - email="ortemeo@gmail.com", - organization="Revercode", - organization_url="https://revercode.com")]), - deploy_dir=Path(__file__).parent / "build" / "rtmaven") + ProjectMeta(group=Group("io.github.rtmigo"), + artifact=Artifact("precise"), + description="Kotlin/JVM compensated summation of Double sequences " + "to calculate sum, mean, standard deviation", + license_name="MIT License", + github=GithubRepo(owner="rtmigo", repo="precise_kt", branch="master"), + devs=[Developer( + name="Artsiom iG", + email="ortemeo@gmail.com") + # organization="Revercode", + # organization_url="https://revercode.com") + ]), + # deploy_dir=Path(__file__).parent / "build" / "rtmaven" + ) From 608c0038327c62f5af1c2344c5d43e608cb37ff8 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Fri, 14 Oct 2022 03:03:40 +0300 Subject: [PATCH 23/31] testing rtmaven --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3e05626..6d0f95b 100644 --- a/.gitignore +++ b/.gitignore @@ -75,4 +75,5 @@ distTmp/ outTmp/ /test.output /kotlin-native/dist -kotlin-ide/ \ No newline at end of file +kotlin-ide/ +*.hprof \ No newline at end of file From 533e613870e3d8ceef85b640a6a716bd8bbe60bb Mon Sep 17 00:00:00 2001 From: Artem IG Date: Fri, 14 Oct 2022 04:34:21 +0300 Subject: [PATCH 24/31] testing rtmaven --- build.gradle.kts | 1 + msnpub.py | 70 ++++++++++++++++++++++++++++++++++++++-- test_sonatype_staging.py | 60 ++++++++++++++++++++++++++++++++++ 3 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 test_sonatype_staging.py diff --git a/build.gradle.kts b/build.gradle.kts index 1403c49..4f6aad7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,6 +34,7 @@ java { repositories { mavenCentral() + } dependencies { diff --git a/msnpub.py b/msnpub.py index 781f14b..f6fc8df 100644 --- a/msnpub.py +++ b/msnpub.py @@ -1,8 +1,69 @@ from pathlib import Path -from rtmaven import maven_release_to_dir, Group, Artifact, ProjectMeta, GithubRepo, Developer + +import time +from rtmaven import maven_release_to_dir, Group, Artifact, StagingLib, Artifact, ProjectMeta, \ + GithubRepo, \ + Developer, eprint, eprint_header +from tempp import TempProject + + +def test_import_from_maven(staging_lib: StagingLib): + # module = "io.github.rtmigo:precise:0.1.0-dev19" + with TempProject( + files={ + # minimalistic build script to use the library + "build.gradle.kts": """ + plugins { + id("application") + kotlin("jvm") version "1.6.20" + } + + repositories { + maven { url = uri("__REPO__") } + mavenCentral() + } + application { mainClass.set("MainKt") } + + dependencies { + implementation("__MODULE__") + } + """.replace("__MODULE__", str(staging_lib.library)).replace("__REPO__", + staging_lib.maven_url), + + # kotlin code that imports and uses the library + "src/main/kotlin/Main.kt": """ + import io.github.rtmigo.precise.* + + fun main() { + println(listOf(1.0, 2.0).preciseSumOf {it}) + } + """} + ) as app: + eprint(app.files_content()) + result = app.run(["gradle", "run", "-q"]) + + eprint("returncode", result.returncode) + + eprint("stderr", "-" * 80) + eprint(result.stderr) + + eprint("stdout", "-" * 80) + eprint(result.stdout) + eprint("-" * 80) + + assert result.returncode == 0 + assert result.stdout == "3.0\n", result.stdout + + eprint("Everything is OK!") + + +# test_import_from_maven( +# maven_repo_url="https://s01.oss.sonatype.org/content/repositories/iogithubrtmigo-1014/", +# artifact=Artifact.parse("io.github.rtmigo:precise:0.1.0-dev19") +# ) if __name__ == "__main__": - maven_release_to_dir( + staging = maven_release_to_dir( ProjectMeta(group=Group("io.github.rtmigo"), artifact=Artifact("precise"), description="Kotlin/JVM compensated summation of Double sequences " @@ -17,3 +78,8 @@ ]), # deploy_dir=Path(__file__).parent / "build" / "rtmaven" ) + + eprint_header("Testing staging") + eprint() + test_import_from_maven(staging) + diff --git a/test_sonatype_staging.py b/test_sonatype_staging.py new file mode 100644 index 0000000..6669f53 --- /dev/null +++ b/test_sonatype_staging.py @@ -0,0 +1,60 @@ +import sys + +from tempp import * + + +def test_import_from_maven( + maven_repo_url: str, + version: str): + module = "io.github.rtmigo:precise:0.1.0-dev19" + with TempProject( + files={ + # minimalistic build script to use the library + "build.gradle.kts": """ + plugins { + id("application") + kotlin("jvm") version "1.6.20" + } + + repositories { + maven { url = uri(f"__REPO__") } + mavenCentral() + } + application { mainClass.set("MainKt") } + + dependencies { + implementation("__MODULE__") + } + """.replace("__MODULE__", module).replace("__REPO__", maven_repo_url), + + # kotlin code that imports and uses the library + "src/main/kotlin/Main.kt": """ + import io.github.rtmigo.precise.* + + fun main() { + println(listOf(1.0, 2.0).preciseSumOf {it}) + } + """} + ) as app: + print(app) + result = app.run(["gradle", "run", "-q"]) + + print("returncode", result.returncode) + + print("stderr", "-" * 80) + print(result.stderr) + + print("stdout", "-" * 80) + print(result.stdout) + print("-" * 80) + + assert result.returncode == 0 + assert result.stdout == "3.0\n", result.stdout + + print("Everything is OK!") + + +test_import_from_maven( + maven_repo_url="https://s01.oss.sonatype.org/content/repositories/iogithubrtmigo-1014/", + +) From 4cb86b09996138fc90d4b4fbf04b360af4b03ecd Mon Sep 17 00:00:00 2001 From: Artem IG Date: Fri, 14 Oct 2022 04:49:09 +0300 Subject: [PATCH 25/31] testing rtmaven --- .github/workflows/maven.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 08036d0..ca57411 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -31,6 +31,7 @@ jobs: - name: Set up RtMaven run: | pip install git+https://github.com/rtmigo/rtmaven_py + pip install git+https://github.com/rtmigo/tempp_py - name: build run: | From 225e9933a970dce836201e75cd0f5175add57c6f Mon Sep 17 00:00:00 2001 From: Artem IG Date: Fri, 14 Oct 2022 07:12:39 +0300 Subject: [PATCH 26/31] testing rtmaven --- .github/workflows/maven.yaml | 2 ++ msnpub.py | 34 ++++++++++------------------------ 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index ca57411..9b2dbf8 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -43,6 +43,8 @@ jobs: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + # tmpro + # - name: Get the project version # id: get_version diff --git a/msnpub.py b/msnpub.py index f6fc8df..00b4ef0 100644 --- a/msnpub.py +++ b/msnpub.py @@ -1,9 +1,7 @@ from pathlib import Path import time -from rtmaven import maven_release_to_dir, Group, Artifact, StagingLib, Artifact, ProjectMeta, \ - GithubRepo, \ - Developer, eprint, eprint_header +from rtmaven import stage, StagingLib, eprint, eprint_header from tempp import TempProject @@ -22,6 +20,7 @@ def test_import_from_maven(staging_lib: StagingLib): maven { url = uri("__REPO__") } mavenCentral() } + application { mainClass.set("MainKt") } dependencies { @@ -57,29 +56,16 @@ def test_import_from_maven(staging_lib: StagingLib): eprint("Everything is OK!") -# test_import_from_maven( -# maven_repo_url="https://s01.oss.sonatype.org/content/repositories/iogithubrtmigo-1014/", -# artifact=Artifact.parse("io.github.rtmigo:precise:0.1.0-dev19") -# ) - if __name__ == "__main__": - staging = maven_release_to_dir( - ProjectMeta(group=Group("io.github.rtmigo"), - artifact=Artifact("precise"), - description="Kotlin/JVM compensated summation of Double sequences " - "to calculate sum, mean, standard deviation", - license_name="MIT License", - github=GithubRepo(owner="rtmigo", repo="precise_kt", branch="master"), - devs=[Developer( - name="Artsiom iG", - email="ortemeo@gmail.com") - # organization="Revercode", - # organization_url="https://revercode.com") - ]), - # deploy_dir=Path(__file__).parent / "build" / "rtmaven" + staging_lib = stage( + description="Kotlin/JVM compensated summation of Double sequences " + "to calculate sum, mean, standard deviation", + github_url="https://github.com/rtmigo/precise_kt", + github_branch="master", + developer="Artsiom iG ", + license="MIT" ) eprint_header("Testing staging") eprint() - test_import_from_maven(staging) - + test_import_from_maven(staging_lib) From 42c2d44fca432fb819bccfb0dfac7100e04215f4 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Sun, 16 Oct 2022 03:46:14 +0300 Subject: [PATCH 27/31] - removed buildSrc, all vinogradle dependencies, along with publishing and nexus plugins - removed outdated scripts --- .github/workflows/gradle_ci.yaml | 2 +- .github/workflows/maven.yaml | 3 +- build.gradle.kts | 36 +-- buildSrc/.gitignore | 78 ----- buildSrc/LICENSE | 21 -- buildSrc/README.md | 34 --- buildSrc/build.gradle.kts | 24 -- buildSrc/gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - buildSrc/gradlew | 234 --------------- buildSrc/gradlew.bat | 89 ------ .../main/kotlin/vinogradle/maven/Configure.kt | 268 ------------------ .../kotlin/vinogradle/readme/Installation.kt | 51 ---- .../readme/InstallationToReadmeFuncs.kt | 108 ------- msnpub.py => publish_to_maven_central.py | 48 ++-- pull_subtrees.sh | 6 - test_as_git_module.py | 16 +- test_sonatype_staging.py | 60 ---- update_deps.sh | 3 - 19 files changed, 38 insertions(+), 1048 deletions(-) delete mode 100644 buildSrc/.gitignore delete mode 100644 buildSrc/LICENSE delete mode 100644 buildSrc/README.md delete mode 100644 buildSrc/build.gradle.kts delete mode 100644 buildSrc/gradle/wrapper/gradle-wrapper.jar delete mode 100644 buildSrc/gradle/wrapper/gradle-wrapper.properties delete mode 100755 buildSrc/gradlew delete mode 100644 buildSrc/gradlew.bat delete mode 100644 buildSrc/src/main/kotlin/vinogradle/maven/Configure.kt delete mode 100644 buildSrc/src/main/kotlin/vinogradle/readme/Installation.kt delete mode 100644 buildSrc/src/main/kotlin/vinogradle/readme/InstallationToReadmeFuncs.kt rename msnpub.py => publish_to_maven_central.py (58%) delete mode 100755 pull_subtrees.sh delete mode 100644 test_sonatype_staging.py delete mode 100755 update_deps.sh diff --git a/.github/workflows/gradle_ci.yaml b/.github/workflows/gradle_ci.yaml index e3a4210..dbfefd1 100644 --- a/.github/workflows/gradle_ci.yaml +++ b/.github/workflows/gradle_ci.yaml @@ -73,7 +73,7 @@ jobs: - name: Build sample project that uses the library run: | - pip install git+https://github.com/rtmigo/tempp_py + pip install git+https://github.com/rtmigo/tempground_py python test_as_git_module.py dev check-version: diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 9b2dbf8..5ae6e07 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -31,7 +31,8 @@ jobs: - name: Set up RtMaven run: | pip install git+https://github.com/rtmigo/rtmaven_py - pip install git+https://github.com/rtmigo/tempp_py + pip install tempground + - name: build run: | diff --git a/build.gradle.kts b/build.gradle.kts index 4f6aad7..bd60f95 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,18 +1,18 @@ -import vinogradle.maven.MavenMeta +//#import vinogradle.maven.MavenMeta //import vinogradle.publish.PublishToGithub //import io.github.rtmigo.vinogradle.readme.* plugins { - kotlin("jvm") //version "1.7.20" + kotlin("jvm") version "1.7.20" // Следующие плагины управляются из vinogradle, и их версии определяются в buildSrc. // Но подключить их нужно и здесь - id("org.jetbrains.dokka") - id("signing") - id("io.codearte.nexus-staging") // "closeAndReleaseRepository" - id("maven-publish") // "publish" + id("org.jetbrains.dokka") version "1.7.20" + //id("signing") + //id("io.codearte.nexus-staging") // "closeAndReleaseRepository" + //id("maven-publish") // "publish" id("java-library") @@ -20,7 +20,7 @@ plugins { } group = "io.github.rtmigo" -version = "0.1.0-dev19" +version = "0.1.0-dev20" tasks.register("pkgver") { doLast { @@ -34,6 +34,7 @@ java { repositories { mavenCentral() +//# maven { this. } } @@ -43,7 +44,7 @@ dependencies { testImplementation(kotlin("test")) testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0") - testImplementation("io.kotest:kotest-assertions-core:5.4.2") + testImplementation("io.kotest:kotest-assertions-core:5.5.0") } kotlin { @@ -57,26 +58,9 @@ tasks.test { useJUnitPlatform() } -val updateReadme = tasks.register("updateReadme") { - this.githubUrl = "https://github.com/rtmigo/precise_kt" - this.mavenCentral = true -} - -//logger.in - -vinogradle.maven.Publishing.configure( - project, - MavenMeta( - ownerSlashRepo = "rtmigo/precise_kt", - projectName = "precise", - license = "MIT License", - description = "Kotlin/JVM compensated summation of Double sequences " + - "to calculate sum, mean, standard deviation "), - credentials = vinogradle.maven.MavenCredentials.fromEnv() -) tasks.build { - dependsOn(updateReadme) + //dependsOn(updateReadme) } tasks.register("uberJar") { diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore deleted file mode 100644 index 3e05626..0000000 --- a/buildSrc/.gitignore +++ /dev/null @@ -1,78 +0,0 @@ -labuda/ -.DS_Store -.idea/ -kotlin-js-store/ -.idea/shelf -/confluence/target -/dependencies/repo -/android.tests.dependencies -/dependencies/android.tests.dependencies -/dist -/local -/gh-pages -/ideaSDK -/clionSDK -/android-studio/sdk -out/ -/tmp -/intellij -workspace.xml -*.versionsBackup -/idea/testData/debugger/tinyApp/classes* -/jps-plugin/testData/kannotator -/js/js.translator/testData/out/ -/js/js.translator/testData/out-min/ -/js/js.translator/testData/out-pir/ -.gradle/ -build/ -!**/src/**/build -!**/test/**/build -*.iml -!**/testData/**/*.iml -.idea/remote-targets.xml -.idea/libraries/Gradle*.xml -.idea/libraries/Maven*.xml -.idea/artifacts/PILL_*.xml -.idea/artifacts/KotlinPlugin.xml -.idea/modules -.idea/runConfigurations/JPS_*.xml -.idea/runConfigurations/PILL_*.xml -.idea/runConfigurations/_FP_*.xml -.idea/runConfigurations/_MT_*.xml -.idea/libraries -.idea/modules.xml -.idea/gradle.xml -.idea/compiler.xml -.idea/inspectionProfiles/profiles_settings.xml -.idea/.name -.idea/artifacts/dist_auto_* -.idea/artifacts/dist.xml -.idea/artifacts/ideaPlugin.xml -.idea/artifacts/kotlinc.xml -.idea/artifacts/kotlin_compiler_jar.xml -.idea/artifacts/kotlin_plugin_jar.xml -.idea/artifacts/kotlin_jps_plugin_jar.xml -.idea/artifacts/kotlin_daemon_client_jar.xml -.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml -.idea/artifacts/kotlin_main_kts_jar.xml -.idea/artifacts/kotlin_compiler_client_embeddable_jar.xml -.idea/artifacts/kotlin_reflect_jar.xml -.idea/artifacts/kotlin_stdlib_js_ir_* -.idea/artifacts/kotlin_test_js_ir_* -.idea/artifacts/kotlin_stdlib_wasm_* -.idea/artifacts/kotlinx_atomicfu_runtime_* -.idea/artifacts/kotlinx_cli_jvm_* -.idea/jarRepositories.xml -.idea/csv-plugin.xml -.idea/libraries-with-intellij-classes.xml -.idea/misc.xml -node_modules/ -.rpt2_cache/ -libraries/tools/kotlin-test-js-runner/lib/ -local.properties -buildSrcTmp/ -distTmp/ -outTmp/ -/test.output -/kotlin-native/dist -kotlin-ide/ \ No newline at end of file diff --git a/buildSrc/LICENSE b/buildSrc/LICENSE deleted file mode 100644 index 724760b..0000000 --- a/buildSrc/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2022 Artsiom iG - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/buildSrc/README.md b/buildSrc/README.md deleted file mode 100644 index 410e281..0000000 --- a/buildSrc/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# [vinogradle](https://github.com/rtmigo/vinogradle_kt) - -Personal reusable Gradle build script for Kotlin/JVM. Used as a Git Submodule in -other projects. - -### Add "buildSrc" as Git Subtree - -``` -cd /path/to/my_project_kt - -git subtree add --prefix buildSrc https://github.com/rtmigo/vinogradle_kt dev --squash -``` - -### Edit project dependencies - -```kotlin -plugins { - kotlin("jvm") // not specifying version - - id("org.jetbrains.dokka") - id("signing") - id("io.codearte.nexus-staging") // for "closeAndReleaseRepository" - id("maven-publish") // for "publish" -} -``` - -### Update "buildSrc" from Git Subtree - -``` -cd /path/to/my_project_kt - -git subtree pull --prefix buildSrc https://github.com/rtmigo/vinogradle_kt dev --squash -m "Pulling vinogradle from GitHub" - -``` diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index 716be1e..0000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,24 +0,0 @@ - -dependencies { - implementation("org.jetbrains.kotlin:kotlin-script-runtime:1.5.21") - implementation("io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0") - - // если не подключить плагин Kotlin, Dokka запустится, но ничего не сгенерирует, сообщив - // "Exiting Generation: Nothing to document". То есть, нужно непременное включить kotlin("jvm") - // или его аналог - implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.7.10") - - // следующая строчка аналогична по смыслу kotlin("jvm") version "1.7.20" - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") -} - -plugins { - `java-gradle-plugin` - `kotlin-dsl` - `kotlin-dsl-precompiled-script-plugins` -} - -repositories { - mavenCentral() - gradlePluginPortal() -} \ No newline at end of file diff --git a/buildSrc/gradle/wrapper/gradle-wrapper.jar b/buildSrc/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 41d9927a4d4fb3f96a785543079b8df6723c946b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59821 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 diff --git a/buildSrc/gradle/wrapper/gradle-wrapper.properties b/buildSrc/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 41dfb87..0000000 --- a/buildSrc/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/buildSrc/gradlew b/buildSrc/gradlew deleted file mode 100755 index 1b6c787..0000000 --- a/buildSrc/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/buildSrc/gradlew.bat b/buildSrc/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/buildSrc/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/buildSrc/src/main/kotlin/vinogradle/maven/Configure.kt b/buildSrc/src/main/kotlin/vinogradle/maven/Configure.kt deleted file mode 100644 index adf5c52..0000000 --- a/buildSrc/src/main/kotlin/vinogradle/maven/Configure.kt +++ /dev/null @@ -1,268 +0,0 @@ -package vinogradle.maven - -import io.codearte.gradle.nexus.NexusStagingExtension -import org.gradle.api.* -import org.gradle.api.publish.PublishingExtension -import org.gradle.api.publish.maven.MavenPublication -import org.gradle.jvm.tasks.Jar -import org.gradle.kotlin.dsl.get -import org.gradle.plugins.signing.SigningExtension -import org.jetbrains.dokka.gradle.DokkaTask -import java.net.URI - - -data class MavenMeta( - val ownerSlashRepo: String, - val license: String, - val projectName: String, - val description: String, -) - -class EnvKeyNotFoundException(key: String): Exception("Env does not have non-blank '$key' defined.") - -fun getenvOrThrow(key: String): String { - val result = System.getenv(key) - if (result == null || result.isBlank()) - throw EnvKeyNotFoundException(key) - return result -} - - - -sealed class MavenCredentials { - companion object { - /** - * Генерирует экземпляр [MavenCredentials], конкретный тип которого зависит от заданных - * переменных среды. - **/ - fun fromEnv(): MavenCredentials { - fun tryCreate(block: () -> MavenCredentials) = - try { - block() - } catch (_: EnvKeyNotFoundException) { - null - } - - val results = listOfNotNull( - tryCreate { GithubCredentials.fromEnv() }, - tryCreate { SonatypeCredentials.fromEnv() }, - ) - - return when (results.size) { - 0 -> LocalCredentials - 1 -> results.single() - else -> - throw Error("Env contains ${results.size} possible matching variables") - }.also { - System.err.println("Auto-detected ${MavenCredentials::class.simpleName} type: " + - "${it::class.simpleName}") - } - } - } -} - - - - -data class GithubCredentials( - var token: String, -) : MavenCredentials() { - companion object { - fun fromEnv() = GithubCredentials(getenvOrThrow("GITHUB_PKGPUB_TOKEN")) - } -} - -object LocalCredentials : MavenCredentials() - -/** - * В этом объекте объединены реквизиты Sonatype и GPG, поскольку использую я их только вместе. - * Sonatype требует подписей GPG для публикаций в Maven Central. Другие публикации в Maven подписей - * не требуют. - **/ -data class SonatypeCredentials( - /** Имя пользователя Sonatype, либо токен username */ - val username: String, - /** Пароль Sonatype, либо токен password */ - val password: String, - /** ASCII armored key */ - val gpgPrivateKey: String, - /** Пароль для дешифровки из [gpgPrivateKey] */ - val gpgPassword: String, -) : MavenCredentials() { - companion object { - fun fromEnv() = SonatypeCredentials( - username = getenvOrThrow("SONATYPE_USERNAME"), - password = getenvOrThrow("SONATYPE_PASSWORD"), - gpgPrivateKey = getenvOrThrow("MAVEN_GPG_KEY"), - gpgPassword = getenvOrThrow("MAVEN_GPG_PASSWORD")) - } -} - -/** - * 2022-10 Я выяснил, что конфигурирование блоком `publishing { }` действует на таски `publish` и - * `publishToMavenLocal` только если вписывается прямо в тело `build.gradle.kts` (то есть, - * выполняется первым делом). Если сделать это с запаздыванием, например, из собственного таска - * (`doFirst` или `MyTask: Task`) - то конфигурация запоминается внутри `Project`, но `publish` и - * `publishToMavenLocal` ничего не публикуют. - * - * То есть, (пока) не получится создать таски: - * ``` - * ./gradlew publishToGithub - * ./gradlew configForGithub publish - * ``` - * - * Поэтому следующий код описан не как задача, а как функции - чтобы запустить их из тела - * `build.gradle.kts`. Причём, для каждого запуска `gradlew` вызов функции допустим ровно один раз. - * - * Это накладывает ограничение: при отдельном запуске `gradlew` мы сможем обновить не более одного - * репозитория. Чтобы отправить проект в три репозитория, нужно будет написать скрипт снаружи - * `gradlew` - который запустит три команды. - * - * Технически можно было бы внутри `publishing` задать сразу несколько целевых репозиториев, чтобы - * отправлять одним махом на Sonatype и GitHub Packages. Но к надежности и простоте тестирования - * это будет минус. К тому же, пакеты нужно генерировать слегка разные (Sonatype с GPG-подписью), - * и этапов разное количество. В общем, это путь неоправданного объединения сущностей. - * - * Можно внутри Gradle сделать конфигурирование зависимым от наличия переменных среды, - * а далее запускать, условно говоря, так: - * - * Maven Central: - * ```bash - * SONATYPE_CREDENTIALS=abcd ./gradlew publish closeAndReleaseRepository - * ``` - * - * GitHub: - * ```bash - * GITHUB_CREDENTIALS=abcd ./gradlew publish - * ``` - **/ -object Publishing { - - private var configured = false - - private fun Project.configureNamed(name: String, func: Action) { - (this as org.gradle.api.plugins.ExtensionAware).extensions - .configure(name, func) - } - - private fun Project.publishingBlock(func: Action) = - this.configureNamed("publishing", func) - - private fun Project.nexusStagingBlock(func: Action) = - this.configureNamed("nexusStaging", func) - - private fun Project.signingBlock(func: Action) = - this.configureNamed("signing", func) - - private val Project.publishingExt: PublishingExtension - get() = (this as org.gradle.api.plugins.ExtensionAware) - .extensions.getByName("publishing") as PublishingExtension - - private fun javadocJar(project: Project) = - project.tasks.create("javaDocJar", Jar::class.java) { - //println(project.tasks.filter { it is DokkaTask }) - val dokkaHtml = project.tasks.getByPath(":dokkaHtml") as DokkaTask - this.dependsOn(dokkaHtml) - this.archiveClassifier.set("javadoc") - this.from(dokkaHtml.outputDirectory) - } - - /** - * В зависимости от типа экземпляра [credentials] конфигурируем `publish` для публикаций - * на Maven Central, GitHub Packages или локально. - **/ - public fun configure( - project: Project, - meta: MavenMeta, - credentials: MavenCredentials, - ) { - project.logger.info("${(::configure)::name.get()} called for $meta and ${credentials::class}") - - if (this.configured) { - project.logger.warn("${(::configure)::name.get()} running again") - } - this.configured = true - - //val jdoc = - - project.publishingBlock { - repositories { - when (credentials) { - is LocalCredentials -> { - // pass - } - is GithubCredentials -> - maven { - name = "GitHubPackages" - url = URI("https://maven.pkg.github.com/${meta.ownerSlashRepo}") - - credentials { - username = meta.ownerSlashRepo.substringBefore("/") - password = credentials.token - } - } - is SonatypeCredentials -> - maven { - url = if (project.version.toString().endsWith("SNAPSHOT")) - URI("https://s01.oss.sonatype.org/content/repositories/snapshots/") - else - URI("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") - credentials { - username = credentials.username // можно токен - password = credentials.password // можно токен - } - } - } - } - publications { - - register("maven", MavenPublication::class.java) { - from(project.components.getByName("java")) - artifact(javadocJar(project)) - - pom { - name.set(meta.projectName) - url.set("https://github.com/${meta.ownerSlashRepo}") - description.set(meta.description) - - developers { - developer { - id.set("rtmigo") - name.set("Artsiom iG") - email.set("ortemeo@gmail.com") - } - } - - licenses { - license { - name.set(meta.license) - url.set("https://github.com/${meta.ownerSlashRepo}/blob/-/LICENSE") - } - } - - scm { - connection.set("scm:https://github.com/${meta.ownerSlashRepo}.git") - developerConnection.set("scm:git@github.com:${meta.ownerSlashRepo}.git") - url.set("https://github.com/${meta.ownerSlashRepo}") - } - } - } - } - } - - if (credentials is SonatypeCredentials) { - project.nexusStagingBlock { - // конфигурируем плагин id("io.codearte.nexus-staging"). - // Задачу можно будет запустить так: ./gradlew closeAndReleaseRepository - serverUrl = "https://s01.oss.sonatype.org/service/local/" - username = credentials.username - password = credentials.password - } - - project.signingBlock { - useInMemoryPgpKeys(credentials.gpgPrivateKey, credentials.gpgPassword) - sign(project.publishingExt.publications["maven"]) - } - } - } -} diff --git a/buildSrc/src/main/kotlin/vinogradle/readme/Installation.kt b/buildSrc/src/main/kotlin/vinogradle/readme/Installation.kt deleted file mode 100644 index 663429e..0000000 --- a/buildSrc/src/main/kotlin/vinogradle/readme/Installation.kt +++ /dev/null @@ -1,51 +0,0 @@ -package vinogradle.readme - -import org.gradle.api.DefaultTask -import org.gradle.api.tasks.* - -/** - * Finds "README.md" file in the project root and automatically adds installation instructions. - **/ -abstract class Installation : DefaultTask() { - @Input - @Optional - var githubUrl: String? = null - - @Input - var sectionTitle: String = "Install" - - @Input - var mavenCentral: Boolean = false - - private fun mavenCentralMd() = - mavenCentral.let { - if (it) { - project.toLibVer().toGradleInstallationMd() - .toSpoiler("Install from Maven Central with Gradle") + "\n\n" + - project.toLibVer().toMavenInstallationMd() - .toSpoiler("Install from Maven Central with Maven") + "\n\n" - } else - "" - } - - private fun githubMd() = githubUrl.let { - if (it != null) - project.toLibVer().toGithubInstallationMd(it) - .toSpoiler("Install latest from GitHub with Gradle/Kotlin") + "\n\n" - else - "" - - } - - - @TaskAction - fun update() { - val instructionsMd = mavenCentralMd() + githubMd() - project.rootDir.resolve("README.md").apply { - val oldText = readText() - val newText = oldText.replaceSectionInMd(sectionTitle, instructionsMd) - if (newText != oldText) - writeText(newText) - } - } -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/vinogradle/readme/InstallationToReadmeFuncs.kt b/buildSrc/src/main/kotlin/vinogradle/readme/InstallationToReadmeFuncs.kt deleted file mode 100644 index faee745..0000000 --- a/buildSrc/src/main/kotlin/vinogradle/readme/InstallationToReadmeFuncs.kt +++ /dev/null @@ -1,108 +0,0 @@ -package vinogradle.readme - -import org.gradle.api.* - - -data class LibVer(val group: String, val artifact: String, val version: String) - -fun Project.toLibVer() = - LibVer( - group = this.group.toString(), - artifact = this.name, - version = """[0-9\.]+""".toRegex() - .find(this.version.toString())!! - .groupValues.single() - ) - -fun LibVer.toGithubInstallationMd( - repoUrl: String, - branch: String = "staging", -) = - """ - #### settings.gradle.kts - - ```kotlin - sourceControl { - gitRepository(java.net.URI("$repoUrl.git")) { - producesModule("${this.group}:${this.artifact}") - } - } - ``` - - #### build.gradle.kts - - ```kotlin - dependencies { - implementation("${this.group}:${this.artifact}") { - version { branch = "$branch" } - } - } - ``` - """.trimIndent() - -fun String.toSpoiler(summary: String) = - "
$summary\n\n$this\n\n
" - -fun LibVer.toGradleInstallationMd() = - """ - ### build.gradle.kts (Gradle/Kotlin) - - ```kotlin - repositories { - mavenCentral() - } - - dependencies { - implementation("$group:$artifact:$version") - } - ``` - - or - - ### build.gradle (Gradle/Groovy) - - ```groovy - repositories { - mavenCentral() - } - - dependencies { - implementation "$group:$artifact:$version" - } - ``` - """.trimIndent() - -fun LibVer.toMavenInstallationMd() = - """ - ## Maven - - ```xml - - - $group - $artifact - $version - - - ``` - """.trimIndent() - - -/** Replaces text between "# Title" and "# Next Title". */ -public fun String.replaceSectionInMd( - sectionTitle: String, - newSectionText: String, -): String { - var changesMade = 0 - - val result = "([\n\r]#\\s+$sectionTitle\\s*[\n\r]).*?([\n\r]#\\s)" - .toRegex(RegexOption.DOT_MATCHES_ALL) - .replace(this) { - changesMade = 1 - it.groups[1]!!.value + newSectionText + it.groups[2]!!.value - } - - require(changesMade==1) { "changesMade=$changesMade" } - - return result -} \ No newline at end of file diff --git a/msnpub.py b/publish_to_maven_central.py similarity index 58% rename from msnpub.py rename to publish_to_maven_central.py index 00b4ef0..623ca62 100644 --- a/msnpub.py +++ b/publish_to_maven_central.py @@ -1,13 +1,12 @@ from pathlib import Path import time -from rtmaven import stage, StagingLib, eprint, eprint_header -from tempp import TempProject +from rtmaven import prepare, stage, promote, Package, eprint, eprint_header +from tempground import TempGround -def test_import_from_maven(staging_lib: StagingLib): - # module = "io.github.rtmigo:precise:0.1.0-dev19" - with TempProject( +def test_package(package: Package): + with TempGround( files={ # minimalistic build script to use the library "build.gradle.kts": """ @@ -17,22 +16,22 @@ def test_import_from_maven(staging_lib: StagingLib): } repositories { - maven { url = uri("__REPO__") } + maven { url = uri("__TEMP_REPO__") } mavenCentral() } application { mainClass.set("MainKt") } dependencies { - implementation("__MODULE__") + implementation("io.github.rtmigo:precise:__VERSION__") } - """.replace("__MODULE__", str(staging_lib.library)).replace("__REPO__", - staging_lib.maven_url), + """.replace("__VERSION__", str(package.notation.version)) + .replace("__TEMP_REPO__", package.maven_url), # kotlin code that imports and uses the library "src/main/kotlin/Main.kt": """ import io.github.rtmigo.precise.* - + fun main() { println(listOf(1.0, 2.0).preciseSumOf {it}) } @@ -40,15 +39,7 @@ def test_import_from_maven(staging_lib: StagingLib): ) as app: eprint(app.files_content()) result = app.run(["gradle", "run", "-q"]) - - eprint("returncode", result.returncode) - - eprint("stderr", "-" * 80) - eprint(result.stderr) - - eprint("stdout", "-" * 80) - eprint(result.stdout) - eprint("-" * 80) + eprint(result) assert result.returncode == 0 assert result.stdout == "3.0\n", result.stdout @@ -56,16 +47,19 @@ def test_import_from_maven(staging_lib: StagingLib): eprint("Everything is OK!") -if __name__ == "__main__": - staging_lib = stage( +def build_test_release(): + package = stage(prepare( description="Kotlin/JVM compensated summation of Double sequences " "to calculate sum, mean, standard deviation", - github_url="https://github.com/rtmigo/precise_kt", - github_branch="master", + github_url="https://github.com/rtmigo/precise_kt@master", developer="Artsiom iG ", - license="MIT" - ) + license="MIT")) - eprint_header("Testing staging") + eprint_header("Testing") eprint() - test_import_from_maven(staging_lib) + test_package(package) + # promote(package) + + +if __name__ == "__main__": + build_test_release() diff --git a/pull_subtrees.sh b/pull_subtrees.sh deleted file mode 100755 index d358f2c..0000000 --- a/pull_subtrees.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -e && cd "${0%/*}" - -git add . -git commit -m "Before pulling vinogradle" --allow-empty -git subtree pull --prefix buildSrc https://github.com/rtmigo/vinogradle_kt dev --squash -m "Pulling vinogradle from GitHub" \ No newline at end of file diff --git a/test_as_git_module.py b/test_as_git_module.py index a7127fa..b16889d 100644 --- a/test_as_git_module.py +++ b/test_as_git_module.py @@ -1,6 +1,6 @@ import sys -from tempp import * +from tempground import * module="io.github.rtmigo:precise" @@ -19,7 +19,7 @@ except IndexError: imp_details = "" -with TempProject( +with TempGround( files={ # minimalistic build script to use the library "build.gradle.kts": """ @@ -48,17 +48,9 @@ # kotlin code that imports and uses the library "src/main/kotlin/Main.kt": code}) as app: - app.print_files() + print(app.files_content()) result = app.run(["gradle", "run", "-q"]) - - print("returncode", result.returncode) - - print("stderr", "-"*80) - print(result.stderr) - - print("stdout", "-"*80) - print(result.stdout) - print("-"*80) + print(result) assert result.returncode == 0 assert result.stdout == "3.0\n", result.stdout diff --git a/test_sonatype_staging.py b/test_sonatype_staging.py deleted file mode 100644 index 6669f53..0000000 --- a/test_sonatype_staging.py +++ /dev/null @@ -1,60 +0,0 @@ -import sys - -from tempp import * - - -def test_import_from_maven( - maven_repo_url: str, - version: str): - module = "io.github.rtmigo:precise:0.1.0-dev19" - with TempProject( - files={ - # minimalistic build script to use the library - "build.gradle.kts": """ - plugins { - id("application") - kotlin("jvm") version "1.6.20" - } - - repositories { - maven { url = uri(f"__REPO__") } - mavenCentral() - } - application { mainClass.set("MainKt") } - - dependencies { - implementation("__MODULE__") - } - """.replace("__MODULE__", module).replace("__REPO__", maven_repo_url), - - # kotlin code that imports and uses the library - "src/main/kotlin/Main.kt": """ - import io.github.rtmigo.precise.* - - fun main() { - println(listOf(1.0, 2.0).preciseSumOf {it}) - } - """} - ) as app: - print(app) - result = app.run(["gradle", "run", "-q"]) - - print("returncode", result.returncode) - - print("stderr", "-" * 80) - print(result.stderr) - - print("stdout", "-" * 80) - print(result.stdout) - print("-" * 80) - - assert result.returncode == 0 - assert result.stdout == "3.0\n", result.stdout - - print("Everything is OK!") - - -test_import_from_maven( - maven_repo_url="https://s01.oss.sonatype.org/content/repositories/iogithubrtmigo-1014/", - -) diff --git a/update_deps.sh b/update_deps.sh deleted file mode 100755 index 94ef35a..0000000 --- a/update_deps.sh +++ /dev/null @@ -1,3 +0,0 @@ -#hubget https://github.com/rtmigo/cicd/blob/dev/gradle/pipe.yaml .github/workflows/ -#hubget https://github.com/rtmigo/cicd/blob/dev/gradle/on_release_pub_gh.yaml .github/workflows/ -#hubget https://github.com/rtmigo/cicd/blob/dev/gradle/gradle_pkgver_not_on_gh.py .github/ \ No newline at end of file From 1b6c4484653f8f409ba94a6ad2ba6edae13367c6 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Sun, 16 Oct 2022 03:47:47 +0300 Subject: [PATCH 28/31] ci --- .github/{workflows => disabled}/maven.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{workflows => disabled}/maven.yaml (100%) diff --git a/.github/workflows/maven.yaml b/.github/disabled/maven.yaml similarity index 100% rename from .github/workflows/maven.yaml rename to .github/disabled/maven.yaml From 4a1fd68d45f496bda1708c40c33eab8aff043233 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Sun, 16 Oct 2022 04:07:26 +0300 Subject: [PATCH 29/31] setting up releases via actions !!release --- .github/disabled/maven.yaml | 2 +- .github/gradle_pkgver_notag.py | 61 ------------ ...gradle_ci.yaml => gradle_ci_modified.yaml} | 99 ++++++++++++++----- build.gradle.kts | 2 +- publish_to_maven_central.py | 2 +- 5 files changed, 75 insertions(+), 91 deletions(-) delete mode 100644 .github/gradle_pkgver_notag.py rename .github/workflows/{gradle_ci.yaml => gradle_ci_modified.yaml} (68%) diff --git a/.github/disabled/maven.yaml b/.github/disabled/maven.yaml index 5ae6e07..7ef2f51 100644 --- a/.github/disabled/maven.yaml +++ b/.github/disabled/maven.yaml @@ -30,7 +30,7 @@ jobs: - name: Set up RtMaven run: | - pip install git+https://github.com/rtmigo/rtmaven_py + pip install git+https://github.com/rtmigo/rtmaven_py@dev pip install tempground diff --git a/.github/gradle_pkgver_notag.py b/.github/gradle_pkgver_notag.py deleted file mode 100644 index 3a9d50d..0000000 --- a/.github/gradle_pkgver_notag.py +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# 2022-10-13 00:08 | DO NOT EDIT. GENERATED BY ATOMATR -################################################################################ - -import os.path -import re -import subprocess -import sys - - -def _gh_release_exists(ver: str) -> bool: # не используется с 2022-10 - """Возвращает `true`, если репозитории гитхаба, соответствующем текущему - `.git`, уже существует релиз версии `ver`. """ - try: - subprocess.check_output(["gh", "release", "view", ver], - stderr=subprocess.STDOUT) - return True - except subprocess.CalledProcessError as e: - if e.output.strip() == b'release not found': - return False - raise - - -def _git_tag_exists(tag: str) -> bool: - return subprocess.check_output(["git", "tag", "-l", tag]) \ - .decode().strip() != "" - - -def _gradle_pkgver() -> str: - """Полагаем, что в Gradle определён таск "pkgver", который печатает текущую - версию пакета. Запускаем Gradle, выясняем версию, возвращаем её.""" - ver = subprocess.check_output( - [os.path.abspath("gradlew"), "-quiet", "--no-daemon", "--console=plain", - "pkgver"], - stderr=subprocess.STDOUT).splitlines()[-1].decode() - assert re.match(r"^\d+\.\d+.*$", ver) - return ver - - -def _print_unique_pkgver_or_throw(): - """Позволяет определить, готовы ли мы опубликовать текущий проект Gradle - в качестве релиза на GitHub. - - Если да, то версию релиза печатаем в stdout. - Если нет, то возвращаем код ошибки. - - Мы НЕ готовы публиковать, если такой релиз уже существует, либо если - мы не смогли получить версию от Gradle. - - Эта функция может использоваться и непосредственно перед публикацией - - и как предварительная проверка (чтобы не затевать долгий билд). - """ - ver = _gradle_pkgver() - if _git_tag_exists(ver): - print(f"Tag {ver} already exists") - sys.exit(1) - print(ver) - - -if __name__ == "__main__": - _print_unique_pkgver_or_throw() diff --git a/.github/workflows/gradle_ci.yaml b/.github/workflows/gradle_ci_modified.yaml similarity index 68% rename from .github/workflows/gradle_ci.yaml rename to .github/workflows/gradle_ci_modified.yaml index dbfefd1..6f56b0a 100644 --- a/.github/workflows/gradle_ci.yaml +++ b/.github/workflows/gradle_ci_modified.yaml @@ -66,7 +66,7 @@ jobs: distribution: 'temurin' cache: gradle - - name: Set up Python 3.10 + - name: Set up Python uses: actions/setup-python@v2 with: python-version: '3.10' @@ -77,7 +77,7 @@ jobs: python test_as_git_module.py dev check-version: - + needs: [release-flag] runs-on: ubuntu-latest outputs: @@ -85,7 +85,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup JDK - + uses: actions/setup-java@v2 with: java-version: '8' @@ -130,6 +130,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Get the project version + id: get_version + run: echo "::set-output name=result::$(./gradlew properties | grep version | awk '{print $2}')" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Publish GitHub release id: publish_github_release uses: softprops/action-gh-release@v1 @@ -140,41 +145,71 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - to-github-package: - - needs: [ to-github-release ] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup JDK 8 - uses: actions/setup-java@v2 - with: - java-version: '8' - distribution: 'temurin' - cache: gradle - - name: Publish - run: - ./gradlew publish - env: - - GITHUB_PKGPUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# to-github-package: +# +# needs: [ to-github-release ] +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2 +# - name: Setup JDK 8 +# uses: actions/setup-java@v2 +# with: +# java-version: '8' +# distribution: 'temurin' +# cache: gradle +# - name: Publish +# run: +# ./gradlew publish +# env: +# +# GITHUB_PKGPUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} assert-sonatype-credentials-set: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.10' + - name: Set up deps + run: | + pip install git+https://github.com/rtmigo/rtmaven_py@dev - name: Check variables run: | - if [ -z "$MAVEN_GPG_KEY" ]; then exit 1; fi - if [ -z "$MAVEN_GPG_PASSWORD" ]; then exit 1; fi - if [ -z "$SONATYPE_USERNAME" ]; then exit 1; fi - if [ -z "$SONATYPE_PASSWORD" ]; then exit 1; fi + export GPG_TTY=$(tty) + rtmaven check +# if [ -z "$MAVEN_GPG_KEY" ]; then exit 1; fi +# if [ -z "$MAVEN_GPG_PASSWORD" ]; then exit 1; fi +# if [ -z "$SONATYPE_USERNAME" ]; then exit 1; fi +# if [ -z "$SONATYPE_PASSWORD" ]; then exit 1; fi env: MAVEN_GPG_KEY: ${{ secrets.MAVEN_GPG_KEY }} MAVEN_GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} +# to-maven-central-package: +# needs: [ to-github-release, assert-sonatype-credentials-set ] +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2 +# - name: Setup JDK 8 +# uses: actions/setup-java@v2 +# with: +# java-version: '8' +# distribution: 'temurin' +# cache: gradle +# - name: Publish as Maven to Sonatype +# run: +# ./gradlew publish closeAndReleaseRepository +# env: +# MAVEN_GPG_KEY: ${{ secrets.MAVEN_GPG_KEY }} +# MAVEN_GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSWORD }} +# SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} +# SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} +# + to-maven-central-package: needs: [ to-github-release, assert-sonatype-credentials-set ] runs-on: ubuntu-latest @@ -186,12 +221,22 @@ jobs: java-version: '8' distribution: 'temurin' cache: gradle + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.10' + - name: Set up deps + run: | + pip install git+https://github.com/rtmigo/rtmaven_py@dev + pip install tempground + - name: Publish as Maven to Sonatype run: - ./gradlew publish closeAndReleaseRepository + export GPG_TTY=$(tty) + python publish_to_maven_central.py env: MAVEN_GPG_KEY: ${{ secrets.MAVEN_GPG_KEY }} MAVEN_GPG_PASSWORD: ${{ secrets.MAVEN_GPG_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - \ No newline at end of file +# \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index bd60f95..71c43fb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ plugins { } group = "io.github.rtmigo" -version = "0.1.0-dev20" +version = "0.1.0-dev21" tasks.register("pkgver") { doLast { diff --git a/publish_to_maven_central.py b/publish_to_maven_central.py index 623ca62..74da3dc 100644 --- a/publish_to_maven_central.py +++ b/publish_to_maven_central.py @@ -58,7 +58,7 @@ def build_test_release(): eprint_header("Testing") eprint() test_package(package) - # promote(package) + promote(package) if __name__ == "__main__": From f09b07ffdcbd0bfbaba765abb2da3477590c867b Mon Sep 17 00:00:00 2001 From: Artem IG Date: Sun, 16 Oct 2022 04:11:35 +0300 Subject: [PATCH 30/31] setting up releases via actions !!release --- .github/workflows/gradle_ci_modified.yaml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/gradle_ci_modified.yaml b/.github/workflows/gradle_ci_modified.yaml index 6f56b0a..580dd5a 100644 --- a/.github/workflows/gradle_ci_modified.yaml +++ b/.github/workflows/gradle_ci_modified.yaml @@ -1,7 +1,3 @@ -################################################################################ -# 2022-10-13 00:08 | DO NOT EDIT. GENERATED BY ATOMATR -################################################################################ - name: Gradle Pipe on: @@ -97,7 +93,7 @@ jobs: python-version: '3.10' - name: Get the project version id: get_version - run: echo "::set-output name=result::$(python .github/gradle_pkgver_notag.py)" + run: echo "::set-output name=result::$(./gradlew properties | grep version | awk '{print $2}')" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -130,11 +126,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Get the project version - id: get_version - run: echo "::set-output name=result::$(./gradlew properties | grep version | awk '{print $2}')" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# - name: Get the project version +# id: get_version +# run: echo "::set-output name=result::$(./gradlew properties | grep version | awk '{print $2}')" +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Publish GitHub release id: publish_github_release uses: softprops/action-gh-release@v1 @@ -165,6 +161,7 @@ jobs: # GITHUB_PKGPUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} assert-sonatype-credentials-set: + needs: [release-flag] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From db8bbc31b9f68385860d2e58f50c53ae704e8b96 Mon Sep 17 00:00:00 2001 From: Artem IG Date: Sun, 16 Oct 2022 04:12:48 +0300 Subject: [PATCH 31/31] setting up releases via actions !!release --- .github/workflows/gradle_ci_modified.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle_ci_modified.yaml b/.github/workflows/gradle_ci_modified.yaml index 580dd5a..4b1c940 100644 --- a/.github/workflows/gradle_ci_modified.yaml +++ b/.github/workflows/gradle_ci_modified.yaml @@ -87,10 +87,10 @@ jobs: java-version: '8' distribution: 'temurin' cache: gradle - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.10' +# - name: Set up Python +# uses: actions/setup-python@v4 +# with: +# python-version: '3.10' - name: Get the project version id: get_version run: echo "::set-output name=result::$(./gradlew properties | grep version | awk '{print $2}')"