From 2fcc4151aef6a61c824e8a1c855693233ea799a3 Mon Sep 17 00:00:00 2001 From: Mikhail Belyaev Date: Tue, 28 Jan 2020 16:03:22 +0300 Subject: [PATCH] Up the version for kotlin + github actions --- .github/bintray-settings.xml | 12 +++++ .github/workflows/deployment.yml | 53 ++++++++++++++++++++ .github/workflows/integration.yml | 17 +++++++ .gitignore | 1 + pom.xml | 59 ++++++++++++++-------- src/main/antlr4/ANTLRv4Lexer.tokens | 78 ----------------------------- src/main/antlr4/LexBasic.tokens | 0 7 files changed, 120 insertions(+), 100 deletions(-) create mode 100644 .github/bintray-settings.xml create mode 100644 .github/workflows/deployment.yml create mode 100644 .github/workflows/integration.yml delete mode 100644 src/main/antlr4/ANTLRv4Lexer.tokens delete mode 100644 src/main/antlr4/LexBasic.tokens diff --git a/.github/bintray-settings.xml b/.github/bintray-settings.xml new file mode 100644 index 0000000..85f42df --- /dev/null +++ b/.github/bintray-settings.xml @@ -0,0 +1,12 @@ + + + + + bintray-vorpal-research-kotlin-maven + ${env.BINTRAY_USERNAME} + ${env.BINTRAY_PASSWORD} + + + diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml new file mode 100644 index 0000000..3b4aea5 --- /dev/null +++ b/.github/workflows/deployment.yml @@ -0,0 +1,53 @@ +name: Java CD + +on: + release: + types: published + +jobs: + publish: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Deploy to Bintray + id: deploy-to-bintray + run: | + mvn versions:set -DnewVersion=${{ github.event.release.tag_name }} + mvn deploy -s .github/bintray-settings.xml || echo "deploy failed" >&2 + env: + BINTRAY_USERNAME: ${{ secrets.bintray_username }} + BINTRAY_PASSWORD: ${{ secrets.bintray_password }} + + - name: Move sources jar file + run: mv target/*-sources.jar sources.jar + + - name: Move target jar file + run: mv target/*.jar target.jar + + - name: Attach source jar to release + id: upload-source-asset + uses: actions/upload-release-asset@v1.0.1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: sources.jar + asset_name: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}-sources.jar + asset_content_type: application/zip + + - name: Attach target jar to release + id: upload-release-asset + uses: actions/upload-release-asset@v1.0.1 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: target.jar + asset_name: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.jar + asset_content_type: application/zip \ No newline at end of file diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml new file mode 100644 index 0000000..a02111a --- /dev/null +++ b/.github/workflows/integration.yml @@ -0,0 +1,17 @@ +name: Java CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Maven + run: mvn -B package diff --git a/.gitignore b/.gitignore index f83e8cf..f7b2a25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .idea target *.iml +*.tokens diff --git a/pom.xml b/pom.xml index ccf8d62..4a1668a 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,8 @@ UTF-8 true true - 1.2.51 - 4.7.1 + 1.3.61 + 4.8 @@ -26,11 +26,6 @@ kotlin-stdlib-jdk8 ${kotlin.version} - - org.jetbrains.kotlin - kotlin-reflect - ${kotlin.version} - org.jetbrains.kotlin kotlin-test @@ -65,29 +60,49 @@ **/*.g4 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + + process-sources + + add-source + + + + src/main/kotlin + src/main/antlr4 + + + + + + org.apache.maven.plugins - maven-assembly-plugin - 2.6 - - - jar-with-dependencies - - - - ru.spbstu.grammarConverter.MainKt - - - + maven-source-plugin - make-assembly - package - single + attach-sources + + jar + + + + **/*.kt + **/*.java + **/*.g4 + + + org.antlr antlr4-maven-plugin diff --git a/src/main/antlr4/ANTLRv4Lexer.tokens b/src/main/antlr4/ANTLRv4Lexer.tokens deleted file mode 100644 index 1bf330e..0000000 --- a/src/main/antlr4/ANTLRv4Lexer.tokens +++ /dev/null @@ -1,78 +0,0 @@ -TOKEN_REF=1 -RULE_REF=2 -LEXER_CHAR_SET=3 -DOC_COMMENT=4 -BLOCK_COMMENT=5 -LINE_COMMENT=6 -INT=7 -STRING_LITERAL=8 -UNTERMINATED_STRING_LITERAL=9 -BEGIN_ARGUMENT=10 -BEGIN_ACTION=11 -OPTIONS=12 -TOKENS=13 -CHANNELS=14 -IMPORT=15 -FRAGMENT=16 -LEXER=17 -PARSER=18 -GRAMMAR=19 -PROTECTED=20 -PUBLIC=21 -PRIVATE=22 -RETURNS=23 -LOCALS=24 -THROWS=25 -CATCH=26 -FINALLY=27 -MODE=28 -COLON=29 -COLONCOLON=30 -COMMA=31 -SEMI=32 -LPAREN=33 -RPAREN=34 -LBRACE=35 -RBRACE=36 -RARROW=37 -LT=38 -GT=39 -ASSIGN=40 -QUESTION=41 -STAR=42 -PLUS_ASSIGN=43 -PLUS=44 -OR=45 -DOLLAR=46 -RANGE=47 -DOT=48 -AT=49 -POUND=50 -NOT=51 -ID=52 -WS=53 -ERRCHAR=54 -END_ARGUMENT=55 -UNTERMINATED_ARGUMENT=56 -ARGUMENT_CONTENT=57 -END_ACTION=58 -UNTERMINATED_ACTION=59 -ACTION_CONTENT=60 -UNTERMINATED_CHAR_SET=61 -'options'=12 -'tokens'=13 -'channels'=14 -'import'=15 -'fragment'=16 -'lexer'=17 -'parser'=18 -'grammar'=19 -'protected'=20 -'public'=21 -'private'=22 -'returns'=23 -'locals'=24 -'throws'=25 -'catch'=26 -'finally'=27 -'mode'=28 diff --git a/src/main/antlr4/LexBasic.tokens b/src/main/antlr4/LexBasic.tokens deleted file mode 100644 index e69de29..0000000