Skip to content

Commit 8b5d72e

Browse files
committed
Merge branch 'master' into compose
# Conflicts: # .github/workflows/build.yml # build.gradle
2 parents 338a053 + 5544f7b commit 8b5d72e

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
name: Base Checks
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
13-
- uses: actions/setup-java@v3
12+
- uses: actions/checkout@v4
13+
- uses: actions/setup-java@v4
1414
with:
1515
java-version: 17
1616
distribution: temurin
@@ -21,8 +21,8 @@ jobs:
2121
name: Unit Tests
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v3
25-
- uses: actions/setup-java@v3
24+
- uses: actions/checkout@v4
25+
- uses: actions/setup-java@v4
2626
with:
2727
java-version: 17
2828
distribution: temurin
@@ -33,11 +33,11 @@ jobs:
3333
name: Build APK
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737
with:
3838
# required for telegram notifications on PRs
3939
fetch-depth: 0
40-
- uses: actions/setup-java@v3
40+
- uses: actions/setup-java@v4
4141
with:
4242
java-version: 17
4343
distribution: temurin
@@ -51,7 +51,7 @@ jobs:
5151
- name: Execute APK build
5252
run: ./gradlew app:assembleDebug --stacktrace
5353

54-
- uses: actions/upload-artifact@v3
54+
- uses: actions/upload-artifact@v4
5555
with:
5656
name: apk-files
5757
path: app/build/outputs/apk/**/*.apk

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# KodeEditor [![codebeat badge](https://codebeat.co/badges/f7fa8602-1d15-457e-904d-cb585e984952)](https://codebeat.co/projects/github-com-markusressel-kodeeditor-master)
22
A simple code editor with syntax highlighting and pinch to zoom
33

4-
![Editing](https://thumbs.gfycat.com/TalkativeGrandIchthyosaurs-size_restricted.gif)
5-
![Scroll and zoom](https://thumbs.gfycat.com/BouncyLividBlackbear-size_restricted.gif)
6-
![Minimap](https://thumbs.gfycat.com/VigorousDimFrog-size_restricted.gif)
4+
![Editing](screenshot/KodeEditor.png)
75

86
# Features
97
* [x] Pinch-To-Zoom

0 commit comments

Comments
 (0)