Skip to content

Commit 4596e2c

Browse files
EnderDissaEnderDissa
authored
Merge pull request #5 from s4dnex/dev
Апгрейд шаблона или мэйджор импрувментс
2 parents 029dd67 + 4d4419e commit 4596e2c

File tree

24 files changed

+726
-268
lines changed

24 files changed

+726
-268
lines changed

‎.github/workflows/gradle.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# This workflow uses actions that are not certified by GitHub.
2+
# They are provided by a third-party and are governed by
3+
# separate terms of service, privacy policy, and support
4+
# documentation.
5+
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
6+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
7+
8+
name: Gradle build
9+
10+
on:
11+
push:
12+
branches: [ "master", "dev" ]
13+
pull_request:
14+
branches: [ "master", "dev" ]
15+
16+
jobs:
17+
build:
18+
19+
runs-on: ubuntu-latest
20+
permissions:
21+
contents: read
22+
23+
steps:
24+
- uses: actions/checkout@v4
25+
- name: Set up JDK 21
26+
uses: actions/setup-java@v4
27+
with:
28+
java-version: '21'
29+
distribution: 'temurin'
30+
31+
# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
32+
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
33+
- name: Setup Gradle
34+
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
35+
36+
- name: Build with Gradle Wrapper
37+
run: ./gradlew build -PcommitHash=$(git rev-parse --short "$GITHUB_SHA")
38+
39+
- name: Upload build artifacts
40+
uses: actions/upload-artifact@v4
41+
with:
42+
name: '${{ github.event.repository.name }}'
43+
path: build/libs

‎.github/workflows/maven.yml‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 50 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,4 @@
1-
### Java template
2-
# Compiled class file
3-
*.class
4-
5-
# Log file
6-
*.log
7-
8-
# BlueJ files
9-
*.ctxt
10-
11-
# Mobile Tools for Java (J2ME)
12-
.mtj.tmp/
13-
14-
# Package Files #
15-
*.jar
16-
*.war
17-
*.nar
18-
*.ear
19-
*.zip
20-
*.tar.gz
21-
*.rar
22-
23-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
24-
hs_err_pid*
25-
replay_pid*
26-
27-
### JetBrains template
28-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
1+
# Covers JetBrains IDEs: IntelliJ, GoLand, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
292
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
303

314
# User-specific stuff
@@ -50,10 +23,6 @@ replay_pid*
5023
.idea/**/uiDesigner.xml
5124
.idea/**/dbnavigator.xml
5225

53-
# Gradle
54-
.idea/**/gradle.xml
55-
.idea/**/libraries
56-
5726
# Gradle and Maven with auto-import
5827
# When using Gradle or Maven with auto-import, you should exclude module files,
5928
# since they will be recreated, and may cause churn. Uncomment if using
@@ -67,41 +36,66 @@ replay_pid*
6736
# *.iml
6837
# *.ipr
6938

70-
# CMake
71-
cmake-build-*/
72-
73-
# Mongo Explorer plugin
74-
.idea/**/mongoSettings.xml
75-
7639
# File-based project format
7740
*.iws
7841

7942
# IntelliJ
8043
out/
8144

82-
# mpeltonen/sbt-idea plugin
83-
.idea_modules/
84-
85-
# JIRA plugin
86-
atlassian-ide-plugin.xml
87-
88-
# Cursive Clojure plugin
89-
.idea/replstate.xml
90-
91-
# SonarLint plugin
92-
.idea/sonarlint/
93-
9445
# Crashlytics plugin (for Android Studio and IntelliJ)
9546
com_crashlytics_export_strings.xml
9647
crashlytics.properties
9748
crashlytics-build.properties
9849
fabric.properties
9950

100-
# Editor-based Rest Client
101-
.idea/httpRequests
51+
/.idea/
52+
53+
54+
# Java
55+
# Compiled class file
56+
*.class
57+
58+
# Log file
59+
*.log
60+
61+
# BlueJ files
62+
*.ctxt
63+
64+
# Mobile Tools for Java (J2ME)
65+
.mtj.tmp/
66+
67+
# Package Files #
68+
*.jar
69+
*.war
70+
*.nar
71+
*.ear
72+
*.zip
73+
*.tar.gz
74+
*.rar
75+
76+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
77+
hs_err_pid*
78+
replay_pid*
79+
80+
# Gradle
81+
.gradle
82+
**/build/
83+
!**/src/**/build/
84+
85+
# Ignore Gradle GUI config
86+
gradle-app.setting
87+
88+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
89+
!gradle-wrapper.jar
90+
91+
# Avoid ignore Gradle wrappper properties
92+
!gradle-wrapper.properties
10293

103-
# Android studio 3.1+ serialized cache file
104-
.idea/caches/build_file_checksums.ser
94+
# Cache of project
95+
.gradletasknamecache
10596

106-
.idea/*
107-
target/*
97+
# Eclipse Gradle plugin generated files
98+
# Eclipse Core
99+
.project
100+
# JDT-specific (Eclipse Java Development Tools)
101+
.classpath

‎.idea/artifacts/LoginPlugin.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.idea/misc.xml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.idea/modules.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.idea/vcs.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.run/build_release.run.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="[Release] Build" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="build" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

‎.run/build_snapshot.run.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="[Snapshot] Build" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="env">
5+
<map>
6+
<entry key="TEST_PLUGIN_BUILD" value="1" />
7+
</map>
8+
</option>
9+
<option name="executionName" />
10+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
11+
<option name="externalSystemIdString" value="GRADLE" />
12+
<option name="scriptParameters" value="" />
13+
<option name="taskDescriptions">
14+
<list />
15+
</option>
16+
<option name="taskNames">
17+
<list>
18+
<option value="build" />
19+
</list>
20+
</option>
21+
<option name="vmOptions" />
22+
</ExternalSystemSettings>
23+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
24+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
25+
<DebugAllEnabled>false</DebugAllEnabled>
26+
<RunAsTest>false</RunAsTest>
27+
<method v="2" />
28+
</configuration>
29+
</component>

‎JouTakTemplate.iml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)