Skip to content

Commit 763fd67

Browse files
theshadowcotheshadowco
committed
Merge branch 'release/v0.1.1'
2 parents 7847924 + 142f096 commit 763fd67

File tree

10 files changed

+146
-115
lines changed

10 files changed

+146
-115
lines changed

‎.github/workflows/release.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Publish release
2+
3+
on:
4+
release:
5+
types: [published, edited]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
name: Publish release
11+
steps:
12+
- name: Checkout source
13+
uses: actions/checkout@v2
14+
- name: Set up JDK
15+
uses: actions/setup-java@v1
16+
with:
17+
java-version: 11
18+
- name: Build with Gradle
19+
run: ./gradlew build
20+
- name: Upload jar to release
21+
uses: AButler/upload-release-assets@v1.0
22+
with:
23+
files: './build/libs/*.jar'
24+
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ build/
88
/.idea/sonarlint-state.xml
99
/.idea/sonarlint.xml
1010
/.idea/workspace.xml
11+
12+
/.idea/gradle.xml
13+
/.idea/misc.xml
14+
/.idea/vcs.xml

‎.idea/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ plugins {
66
jacoco
77
id("org.cadixdev.licenser") version "0.6.1"
88
id("com.github.gradle-git-version-calculator") version "1.1.0"
9-
id("io.freefair.lombok") version "6.4.3"
9+
id("io.freefair.lombok") version "6.5.0.2"
1010
id("io.freefair.javadoc-links") version "6.5.0.2"
11-
id("io.freefair.javadoc-utf-8") version "6.4.3"
11+
id("io.freefair.javadoc-utf-8") version "6.5.0.2"
1212
id("org.sonarqube") version "3.4.0.2513"
1313
}
1414

@@ -147,7 +147,7 @@ tasks.register("precommit") {
147147
description = "Run all precommit tasks"
148148
group = "Developer tools"
149149
dependsOn(":test")
150-
dependsOn(":licenseFormat")
150+
dependsOn(":updateLicenses")
151151
}
152152

153153
tasks.withType<Javadoc> {

‎license/HEADER.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This file is a part of ${project}.
22

3-
Copyright © ${year}
3+
Copyright (c) ${year}
44
${name} and contributors
55

66
SPDX-License-Identifier: LGPL-3.0-or-later

‎src/main/java/com/github/_1c_syntax/bsl/supconf/GeneralSupportVariant.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
/*
2-
* This file is a part of Support Configuration.
3-
*
4-
* Copyright © 2019 - 2022
5-
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6-
*
7-
* SPDX-License-Identifier: LGPL-3.0-or-later
8-
*
9-
* Support Configuration is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU Lesser General Public
11-
* License as published by the Free Software Foundation; either
12-
* version 3.0 of the License, or (at your option) any later version.
13-
*
14-
* Support Configuration is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
* Lesser General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU Lesser General Public
20-
* License along with Support Configuration.
21-
*/
22-
package com.github._1c_syntax.bsl.supconf;
1+
/*
2+
* This file is a part of Support Configuration.
3+
*
4+
* Copyright (c) 2019 - 2022
5+
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* Support Configuration is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* Support Configuration is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with Support Configuration.
21+
*/
22+
package com.github._1c_syntax.bsl.supconf;
2323

2424
public enum GeneralSupportVariant {
2525
LOCKED, UNLOCKED;

‎src/main/java/com/github/_1c_syntax/bsl/supconf/ParseSupportData.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
/*
2-
* This file is a part of Support Configuration.
3-
*
4-
* Copyright © 2019 - 2022
5-
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6-
*
7-
* SPDX-License-Identifier: LGPL-3.0-or-later
8-
*
9-
* Support Configuration is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU Lesser General Public
11-
* License as published by the Free Software Foundation; either
12-
* version 3.0 of the License, or (at your option) any later version.
13-
*
14-
* Support Configuration is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
* Lesser General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU Lesser General Public
20-
* License along with Support Configuration.
21-
*/
22-
package com.github._1c_syntax.bsl.supconf;
1+
/*
2+
* This file is a part of Support Configuration.
3+
*
4+
* Copyright (c) 2019 - 2022
5+
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* Support Configuration is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* Support Configuration is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with Support Configuration.
21+
*/
22+
package com.github._1c_syntax.bsl.supconf;
2323

2424
import com.github._1c_syntax.bsl.support.SupportVariant;
2525
import lombok.experimental.UtilityClass;

‎src/main/java/com/github/_1c_syntax/bsl/supconf/SupportConfiguration.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
/*
2-
* This file is a part of Support Configuration.
3-
*
4-
* Copyright © 2019 - 2022
5-
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6-
*
7-
* SPDX-License-Identifier: LGPL-3.0-or-later
8-
*
9-
* Support Configuration is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU Lesser General Public
11-
* License as published by the Free Software Foundation; either
12-
* version 3.0 of the License, or (at your option) any later version.
13-
*
14-
* Support Configuration is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
* Lesser General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU Lesser General Public
20-
* License along with Support Configuration.
21-
*/
22-
package com.github._1c_syntax.bsl.supconf;
1+
/*
2+
* This file is a part of Support Configuration.
3+
*
4+
* Copyright (c) 2019 - 2022
5+
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* Support Configuration is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* Support Configuration is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with Support Configuration.
21+
*/
22+
package com.github._1c_syntax.bsl.supconf;
2323

2424
import lombok.AllArgsConstructor;
2525
import lombok.Value;

‎src/main/resources/log4j.xml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" >
2-
<!--
3-
This file is a part of Support Configuration.
4-
5-
Copyright © 2019 - 2022
6-
Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
7-
8-
SPDX-License-Identifier: LGPL-3.0-or-later
9-
10-
Support Configuration is free software; you can redistribute it and/or
11-
modify it under the terms of the GNU Lesser General Public
12-
License as published by the Free Software Foundation; either
13-
version 3.0 of the License, or (at your option) any later version.
14-
15-
Support Configuration is distributed in the hope that it will be useful,
16-
but WITHOUT ANY WARRANTY; without even the implied warranty of
17-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18-
Lesser General Public License for more details.
19-
20-
You should have received a copy of the GNU Lesser General Public
21-
License along with Support Configuration.
22-
-->
23-
<log4j:configuration debug="false">
1+
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" >
2+
<!--
3+
This file is a part of Support Configuration.
4+
5+
Copyright (c) 2019 - 2022
6+
Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
7+
8+
SPDX-License-Identifier: LGPL-3.0-or-later
9+
10+
Support Configuration is free software; you can redistribute it and/or
11+
modify it under the terms of the GNU Lesser General Public
12+
License as published by the Free Software Foundation; either
13+
version 3.0 of the License, or (at your option) any later version.
14+
15+
Support Configuration is distributed in the hope that it will be useful,
16+
but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18+
Lesser General Public License for more details.
19+
20+
You should have received a copy of the GNU Lesser General Public
21+
License along with Support Configuration.
22+
-->
23+
<log4j:configuration debug="false">
2424
<!--Console appender -->
2525
<appender name="stdout" class="org.apache.log4j.ConsoleAppender">
2626
<layout class="org.apache.log4j.PatternLayout">

‎src/test/java/com/github/_1c_syntax/supconf/ParseSupportDataTest.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
/*
2-
* This file is a part of Support Configuration.
3-
*
4-
* Copyright © 2019 - 2022
5-
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6-
*
7-
* SPDX-License-Identifier: LGPL-3.0-or-later
8-
*
9-
* Support Configuration is free software; you can redistribute it and/or
10-
* modify it under the terms of the GNU Lesser General Public
11-
* License as published by the Free Software Foundation; either
12-
* version 3.0 of the License, or (at your option) any later version.
13-
*
14-
* Support Configuration is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
* Lesser General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU Lesser General Public
20-
* License along with Support Configuration.
21-
*/
22-
package com.github._1c_syntax.supconf;
1+
/*
2+
* This file is a part of Support Configuration.
3+
*
4+
* Copyright (c) 2019 - 2022
5+
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
6+
*
7+
* SPDX-License-Identifier: LGPL-3.0-or-later
8+
*
9+
* Support Configuration is free software; you can redistribute it and/or
10+
* modify it under the terms of the GNU Lesser General Public
11+
* License as published by the Free Software Foundation; either
12+
* version 3.0 of the License, or (at your option) any later version.
13+
*
14+
* Support Configuration is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17+
* Lesser General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Lesser General Public
20+
* License along with Support Configuration.
21+
*/
22+
package com.github._1c_syntax.supconf;
2323

2424
import com.github._1c_syntax.bsl.supconf.ParseSupportData;
2525
import com.github._1c_syntax.bsl.support.SupportVariant;

0 commit comments

Comments
 (0)