Skip to content

Commit db82e16

Browse files
authored
Merge pull request #2 from hannesa2/Modernize
Modernize
2 parents 2a5538f + aae7daf commit db82e16

File tree

22 files changed

+213
-205
lines changed

22 files changed

+213
-205
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: Build
33
on:
44
push:
55
branches:
6-
- 'master'
7-
- 'develop'
6+
- master
7+
pull_request:
88

99
jobs:
1010
build:
@@ -13,10 +13,9 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: set up JDK 11
17-
uses: actions/setup-java@v1
16+
- uses: actions/setup-java@v1
1817
with:
19-
java-version: 11
18+
java-version: 17
2019
- name: Make gradlew executable
2120
run: chmod +x ./gradlew
2221
- name: Build with Gradle

.gitignore

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
*.iml
22
.gradle
3-
/local.properties
4-
/.idea/caches
5-
/.idea/libraries
6-
/.idea/modules.xml
7-
/.idea/workspace.xml
8-
/.idea/navEditor.xml
9-
/.idea/assetWizardSettings.xml
3+
local.properties
4+
.idea
105
.DS_Store
11-
/build
12-
/captures
6+
build
7+
captures
138
.externalNativeBuild
149
.cxx
15-
local.properties

.idea/.gitignore

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

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/compiler.xml

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

.idea/gradle.xml

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

.idea/kotlinc.xml

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

.idea/misc.xml

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

.idea/vcs.xml

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

app/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)