From 9e10d4a951af46b367724339583792eed7fec3b1 Mon Sep 17 00:00:00 2001
From: Mikhail Belyaev <belyaev@kspt.icc.spbstu.ru>
Date: Wed, 10 Mar 2021 22:44:09 +0000
Subject: [PATCH] v.0.0.0.4; up Kotlin version && migrate to github packages

---
 .github/github-settings.xml      | 12 ++++++++++++
 .github/workflows/deployment.yml | 10 +++++-----
 pom.xml                          | 10 +++++-----
 3 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 .github/github-settings.xml

diff --git a/.github/github-settings.xml b/.github/github-settings.xml
new file mode 100644
index 0000000..939e73f
--- /dev/null
+++ b/.github/github-settings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>github-vorpal-research-kotlin-maven</id>
+            <username>${env.GITHUB_ACTOR}</username>
+            <password>${env.GITHUB_TOKEN}</password>
+        </server>
+    </servers>
+</settings>
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 3b4aea5..fec6a11 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -15,14 +15,14 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Deploy to Bintray
-      id: deploy-to-bintray
+    - name: Deploy to Github Packages
+      id: deploy-to-packages
       run: |
         mvn versions:set -DnewVersion=${{ github.event.release.tag_name }}
-        mvn deploy -s .github/bintray-settings.xml || echo "deploy failed" >&2
+        mvn deploy -s .github/github-settings.xml || echo "deploy failed" >&2
       env:
-        BINTRAY_USERNAME: ${{ secrets.bintray_username }}
-        BINTRAY_PASSWORD: ${{ secrets.bintray_password }}
+        GITHUB_ACTOR: vorpal-reseacher
+        GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_TOKEN }}
 
     - name: Move sources jar file
       run: mv target/*-sources.jar sources.jar
diff --git a/pom.xml b/pom.xml
index ff2ee99..6ea3ee9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,21 +2,21 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ru.spbstu</groupId>
     <artifactId>g4toEBNF</artifactId>
-    <version>0.0.0.4-SNAPSHOT</version>
+    <version>0.0.0.5-SNAPSHOT</version>
     <name>g4 grammar to markdown</name>
 
     <scm>
         <connection>scm:git:git@github.com:belyaev-mikhail/grammar-converter.git</connection>
         <developerConnection>scm:git:git@github.com:belyaev-mikhail/grammar-converter.git</developerConnection>
         <url>https://github.com/belyaev-mikhail/grammar-converter</url>
-      <tag>HEAD</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <antlr4.visitor>true</antlr4.visitor>
         <antlr4.listener>true</antlr4.listener>
-        <kotlin.version>1.3.61</kotlin.version>
+        <kotlin.version>1.4.31</kotlin.version>
         <antlr4.version>4.8</antlr4.version>
     </properties>
 
@@ -200,9 +200,9 @@
 
     <distributionManagement>
         <repository>
-            <id>bintray-vorpal-research-kotlin-maven</id>
+            <id>github-vorpal-research-kotlin-maven</id>
             <name>vorpal-research-kotlin-maven</name>
-            <url>https://api.bintray.com/maven/vorpal-research/kotlin-maven/${artifactId}/;publish=1</url>
+            <url>https://maven.pkg.github.com/vorpal-research/kotlin-maven</url>
         </repository>
     </distributionManagement>