Skip to content

Commit 6865947

Browse files
Irineu333Irineu333
authored
Merge pull request #48 from NeoUtils/develop
Release v2.2.0 - Custom Window
2 parents 77c4fe6 + 0b0b5bd commit 6865947

File tree

89 files changed

+1580
-842
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1580
-842
lines changed

‎.github/workflows/release-packages.yml

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
name: Release packages
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- develop
7+
- master
8+
9+
workflow_dispatch:
10+
11+
jobs:
12+
build-linux:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
18+
- name: Setup JDK
19+
# TODO: replace this once https://github.com/actions/setup-java/pull/637 gets merged.
20+
uses: gmitch215/setup-java@6d2c5e1f82f180ae79f799f0ed6e3e5efb4e664d
21+
with:
22+
java-version: '17'
23+
distribution: 'jetbrains'
24+
cache: 'gradle'
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
28+
- name: Package
29+
run: |
30+
./gradlew application:packageReleaseTarGz
31+
./gradlew application:packageReleaseDeb
32+
./gradlew application:packageReleaseRpm
33+
34+
- name: Prepare packages
35+
run: |
36+
mkdir -p binaries
37+
mv application/build/distribution/*.tar.gz binaries/
38+
mv application/build/compose/binaries/main-release/deb/*.deb binaries/
39+
mv application/build/compose/binaries/main-release/rpm/*.rpm binaries/
40+
41+
- name: Upload packages
42+
uses: actions/upload-artifact@v4
43+
with:
44+
name: NeoRegex-linux
45+
path: binaries/*
46+
47+
build-windows:
48+
runs-on: windows-latest
49+
steps:
50+
- name: Checkout
51+
uses: actions/checkout@v4
52+
53+
- name: Setup JDK
54+
# TODO: replace this once https://github.com/actions/setup-java/pull/637 gets merged.
55+
uses: gmitch215/setup-java@6d2c5e1f82f180ae79f799f0ed6e3e5efb4e664d
56+
with:
57+
java-version: '17'
58+
distribution: 'jetbrains'
59+
cache: 'gradle'
60+
env:
61+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62+
63+
- name: Package exe
64+
run: ./gradlew application:packageReleaseExe
65+
66+
- name: Upload
67+
uses: actions/upload-artifact@v4
68+
with:
69+
name: NeoRegex-windows
70+
path: application/build/compose/binaries/main-release/exe/*.exe
71+
72+
build-macos:
73+
runs-on: macos-latest
74+
steps:
75+
- name: Checkout
76+
uses: actions/checkout@v4
77+
78+
- name: Setup JDK
79+
# TODO: replace this once https://github.com/actions/setup-java/pull/637 gets merged.
80+
uses: gmitch215/setup-java@6d2c5e1f82f180ae79f799f0ed6e3e5efb4e664d
81+
with:
82+
java-version: '17'
83+
distribution: 'jetbrains'
84+
cache: 'gradle'
85+
env:
86+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
87+
88+
- name: Package dmg
89+
run: ./gradlew application:packageReleaseDmg
90+
91+
- name: Upload dmg
92+
uses: actions/upload-artifact@v4
93+
with:
94+
name: NeoRegex-macos
95+
path: application/build/compose/binaries/main-release/dmg/*.dmg
96+
97+
build-android:
98+
runs-on: ubuntu-latest
99+
steps:
100+
- name: Checkout
101+
uses: actions/checkout@v4
102+
103+
- name: Setup JDK
104+
uses: actions/setup-java@v4
105+
with:
106+
java-version: '17'
107+
distribution: 'zulu'
108+
cache: 'gradle'
109+
110+
- name: Setup Android SDK
111+
uses: android-actions/setup-android@v3
112+
113+
- name: Decode Keystore
114+
run: echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > keystore.jks
115+
116+
- name: Decode Properties
117+
run: echo "${{ secrets.KEYSTORE_PROPERTIES_BASE64 }}" | base64 --decode > keystore.properties
118+
119+
- name: Build apk
120+
run: ./gradlew assembleRelease
121+
122+
- name: Upload apk
123+
uses: actions/upload-artifact@v4
124+
with:
125+
name: NeoRegex-android
126+
path: application/build/outputs/apk/release/*.apk

‎.idea/deploymentTargetSelector.xml

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

‎.idea/gradle.xml

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

‎.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ A cross-platform app to validate regular expressions.
99
</p>
1010

1111
<p align="center">
12-
<img src="images/desktop-dark.png" alt="NeoRegex desktop app"/>
12+
<img src="images/linux-dark-mode.png" alt="NeoRegex desktop app"/>
1313
</p>
1414

1515
<p align="center">
@@ -26,8 +26,10 @@ A cross-platform app to validate regular expressions.
2626
| Platform | Status |
2727
|----------|--------|
2828
| Android | ✅ |
29+
| iOS | ❌ |
2930
| Windows | ✅ |
3031
| Linux | ✅ |
32+
| macOS | ✅ |
3133
| Web | ✅ |
3234

3335
## Build
@@ -37,8 +39,9 @@ I recommend using [Intellij IDEA](https://www.jetbrains.com/idea/download) as th
3739
Compose** and **Compose Multiplatform** plugins installed.
3840

3941
> [!TIP]
40-
> - You can get the **JDK** and **Android SDK** directly from **Intellij IDEA**. <br>
41-
> - Use run configurations to get started. <br>
42+
> - You can obtain the **JDK** and **Android SDK** directly from **IntelliJ IDEA**.
43+
> - Use **JBR** (JetBrains Runtime) for better window integration.
44+
> - Use run configurations to get started.
4245
4346
## License
4447

‎application/build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
1616
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1717
*/
1818

19-
import extension.catalog
20-
import extension.config
19+
import extension.*
2120

2221
plugins {
23-
id("com.neo.regex.android-app")
24-
id("com.neo.regex.desktop-app")
25-
id("com.neo.regex.web-app")
22+
alias(libs.plugins.neoutils.neoregex.android)
23+
alias(libs.plugins.neoutils.neoregex.desktop)
24+
alias(libs.plugins.neoutils.neoregex.web)
2625
}
2726

2827
group = config.basePackage
@@ -43,6 +42,7 @@ kotlin {
4342
implementation(projects.core.designSystem)
4443
implementation(projects.core.resources)
4544
implementation(projects.core.common)
45+
implementation(projects.core.sharedUi)
4646

4747
// voyager
4848
implementation(catalog.voyager.navigator)
@@ -59,7 +59,7 @@ kotlin {
5959
}
6060
}
6161

62-
tasks.register<Tar>("createTarGz") {
62+
tasks.register<Tar>("packageReleaseTarGz") {
6363

6464
group = "distribution"
6565
description = "create a zipped genetic distribution"
@@ -68,7 +68,7 @@ tasks.register<Tar>("createTarGz") {
6868

6969
compression = Compression.GZIP
7070
archiveExtension.set("tar.gz")
71-
archiveFileName.set(config.distName() + ".tar.gz")
71+
archiveFileName.set(config.distribution() + ".tar.gz")
7272
destinationDirectory.set(layout.buildDirectory.dir("distribution"))
7373

7474
into("NeoRegex") {

‎application/installation/com.neoutils.NeoRegex.metainfo.xml

Lines changed: 74 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,78 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<component type="desktop-application">
3-
<id>com.neoutils.NeoRegex</id>
4-
5-
<name>NeoRegex</name>
6-
<summary>An elegant regex validator.</summary>
7-
8-
<metadata_license>FSFAP</metadata_license>
9-
<project_license>GPL-3.0-only</project_license>
10-
11-
<description>
12-
<p>
13-
Create and validate regular expressions easily with NeoRegex.
14-
</p>
15-
</description>
16-
17-
<url type="homepage">https://github.com/NeoUtils/NeoRegex</url>
18-
<url type="bugtracker">https://github.com/NeoUtils/NeoRegex/issues</url>
19-
<url type="vcs-browser">https://github.com/NeoUtils/NeoRegex.git</url>
20-
21-
<launchable type="desktop-id">com.neoutils.NeoRegex.desktop</launchable>
22-
23-
<categories>
24-
<category>Utility</category>
25-
</categories>
26-
27-
<branding>
28-
<color type="primary" scheme_preference="light">#ffffff</color>
29-
<color type="primary" scheme_preference="dark">#222222</color>
30-
</branding>
31-
32-
<screenshots>
33-
<screenshot type="default">
34-
<image>https://raw.githubusercontent.com/NeoUtils/NeoRegex/eb443861161e54f9f9878fdb5ba43b3ed9d177a8/screenshots/desktop-dark.png</image>
35-
<caption>NeoRegex in Dark Mode</caption>
36-
</screenshot>
37-
</screenshots>
38-
39-
<releases>
40-
<release version="2.0.0" date="2024-09-18">
41-
<description>
42-
<p>Desktop version debuts.</p>
43-
<ul>
44-
<li>Visualize the regular expression matches in a text editor.</li>
45-
<li>Visualize capture groups while interacting with the match.</li>
46-
<li>An individual undo and redo system for both the visual expression and the text editor.</li>
47-
</ul>
48-
</description>
49-
</release>
50-
</releases>
51-
52-
<developer id="com.neoutils">
53-
<name>NeoUtils</name>
54-
</developer>
55-
56-
<content_rating type="oars-1.1"/>
3+
<id>com.neoutils.NeoRegex</id>
4+
5+
<name>NeoRegex</name>
6+
<summary>Create and validate regular expressions.</summary>
7+
8+
<metadata_license>FSFAP</metadata_license>
9+
<project_license>GPL-3.0-only</project_license>
10+
11+
<description>
12+
<p>
13+
Visualize the functioning of your regular expressions in real-time with a useful and intuitive tool. With support for capture groups, undo, and redo.
14+
</p>
15+
</description>
16+
17+
<url type="homepage">https://github.com/NeoUtils/NeoRegex</url>
18+
<url type="bugtracker">https://github.com/NeoUtils/NeoRegex/issues</url>
19+
<url type="vcs-browser">https://github.com/NeoUtils/NeoRegex.git</url>
20+
21+
<launchable type="desktop-id">com.neoutils.NeoRegex.desktop</launchable>
22+
23+
<categories>
24+
<category>Utility</category>
25+
</categories>
26+
27+
<branding>
28+
<color type="primary" scheme_preference="light">#ffffff</color>
29+
<color type="primary" scheme_preference="dark">#222222</color>
30+
</branding>
31+
32+
<screenshots>
33+
<screenshot type="default">
34+
<image>
35+
https://raw.githubusercontent.com/NeoUtils/NeoRegex/1bd2a74185c302e8776edfadb41615955c393be5/images/linux-dark-mode.png
36+
</image>
37+
<caption>NeoRegex in Dark Mode</caption>
38+
</screenshot>
39+
40+
<screenshot type="default">
41+
<image>
42+
https://raw.githubusercontent.com/NeoUtils/NeoRegex/1bd2a74185c302e8776edfadb41615955c393be5/images/linux-light-mode.png
43+
</image>
44+
<caption>NeoRegex in Light Mode</caption>
45+
</screenshot>
46+
</screenshots>
47+
48+
<releases>
49+
<release version="2.2.0" date="2024-10-29">
50+
<description>
51+
<p>Version 2.2.0 introduces several enhancements:</p>
52+
<ul>
53+
<li>Small improvements across the application.</li>
54+
<li>Customized window for a personalized experience.</li>
55+
<li>Enhanced touchscreen support for better usability on touch devices.</li>
56+
</ul>
57+
</description>
58+
</release>
59+
60+
<release version="2.0.0" date="2024-09-18">
61+
<description>
62+
<p>Desktop version debuts.</p>
63+
<ul>
64+
<li>Visualize the regular expression matches in a text editor.</li>
65+
<li>Visualize capture groups while interacting with the match.</li>
66+
<li>An individual undo and redo system for both the visual expression and the text editor.</li>
67+
</ul>
68+
</description>
69+
</release>
70+
</releases>
71+
72+
<developer id="com.neoutils">
73+
<name>NeoUtils</name>
74+
</developer>
75+
76+
<content_rating type="oars-1.1"/>
5777

5878
</component>

‎application/src/androidMain/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
android:theme="@android:style/Theme.Material.Light.NoActionBar">
2828

2929
<activity
30-
android:name="com.neo.regex.MainActivity"
30+
android:name="com.neoutils.neoregex.MainActivity"
3131
android:windowSoftInputMode="adjustResize"
3232
android:exported="true">
3333
<intent-filter>

0 commit comments

Comments
 (0)