Skip to content

Commit 456ce1d

Browse files
committed
releasing desktop app
1 parent f10c0bd commit 456ce1d

17 files changed

Lines changed: 65 additions & 18 deletions

File tree

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
3+
src="/Users/artur/AndroidStudioProjects/NoteDelight/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/1024.png"
4+
5+
iconset="icon.iconset"
6+
mkdir -p $iconset
7+
8+
sizes=(16 32 128 256 512)
9+
for size in "${sizes[@]}"; do
10+
convert $src -resize ${size}x${size} $iconset/icon_${size}x${size}.png
11+
convert $src -resize $(($size * 2))x$(($size * 2)) $iconset/icon_${size}x${size}@2x.png
12+
done
13+
14+
iconutil -c icns $iconset
15+
16+
#mv $iconset/../icon.icns .
17+
#rm -rf $iconset

.github/workflows/desktop.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
os: [ubuntu-latest, macos-latest, windows-latest]
15+
os: [ ubuntu-latest, macos-latest, windows-latest ]
1616
steps:
1717
- name: Check out
1818
uses: actions/checkout@v2
@@ -33,13 +33,11 @@ jobs:
3333
with:
3434
java-version: 17
3535
- name: Packaging
36-
run: ./gradlew package
37-
- name: Archive ui-tests-output artifacts
38-
if: ${{ always() }}
39-
uses: actions/upload-artifact@v2
36+
run: ./gradlew packageReleaseDistributionForCurrentOS #TODO packageRelease
37+
- name: Release
38+
uses: softprops/action-gh-release@v1
4039
with:
41-
name: output-ui-tests-artifacts
42-
path: |
43-
desktop-compose-app/build/compose/binaries/main/deb
44-
desktop-compose-app/build/compose/binaries/main/dmg
45-
desktop-compose-app/build/compose/binaries/main/msi
40+
files: |
41+
desktop-compose-app/build/compose/binaries/main-release/deb/*.deb
42+
desktop-compose-app/build/compose/binaries/main-release/dmg/*.dmg
43+
desktop-compose-app/build/compose/binaries/main-release/msi/*.msi

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Supported platforms:
1717

1818
[![google_play_badge](screenshoots/badge-google-play.svg)](https://play.google.com/store/apps/details?id=com.softartdev.noteroom)
1919
[![app_store_badge](screenshoots/badge-app-store.svg)](https://apps.apple.com/ge/app/note-delight/id6444444290)
20+
<a href="https://github.com/softartdev/NoteDelight/releases"><img src="screenshoots/badge-github.webp" alt="github_badge" height="40"></a>
2021

2122
## ARCHITECTURE 🏛
2223

android-compose-app/src/main/java/com/softartdev/notedelight/MainApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package com.softartdev.notedelight
22

33
import android.app.Application
44
import com.softartdev.notedelight.shared.di.allModules
5+
import com.softartdev.notedelight.shared.util.NapierKoinLogger
56
import com.softartdev.notedelight.util.isInLeakCanaryAnalyzerProcess
67
import com.softartdev.notedelight.util.log.CrashlyticsAntilog
7-
import com.softartdev.notedelight.util.log.NapierKoinLogger
88
import io.github.aakira.napier.DebugAntilog
99
import io.github.aakira.napier.Napier
1010
import org.koin.android.ext.koin.androidContext

desktop-compose-app/build.gradle.kts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,18 @@ compose {
4444
mainClass = "com.softartdev.notedelight.MainKt"
4545
nativeDistributions {
4646
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
47-
packageName = "com.softartdev.notedelight"
48-
packageVersion = "1.0.1"
47+
packageName = "Note Delight"
48+
packageVersion = "1.1.3"
49+
description = "Note app with encryption"
50+
copyright = "© 2023 SoftArtDev"
51+
macOS.iconFile.set(project.file("src/jvmMain/resources/app_icon.icns"))
52+
windows.iconFile.set(project.file("src/jvmMain/resources/app_icon.ico"))
53+
linux.iconFile.set(project.file("src/jvmMain/resources/app_icon.png"))
54+
modules("java.sql")
55+
}
56+
buildTypes.release.proguard {
57+
isEnabled = false //FIXME
58+
configurationFiles.from(project.file("compose-desktop.pro"))
4959
}
5060
}
5161
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
-dontwarn com.**
2+
-dontwarn java.**
3+
-dontwarn javax.**
4+
-dontwarn jdk.**
5+
-dontwarn kotlinx.**
6+
-dontwarn org.**
7+
8+
-keep class com.arkivanov.decompose.extensions.compose.jetbrains.mainthread.SwingMainThreadChecker

desktop-compose-app/src/jvmMain/kotlin/com/softartdev/notedelight/Main.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.arkivanov.decompose.extensions.compose.jetbrains.lifecycle.LifecycleC
1313
import com.arkivanov.essenty.lifecycle.LifecycleRegistry
1414
import com.softartdev.notedelight.shared.di.allModules
1515
import com.softartdev.notedelight.shared.runOnUiThread
16+
import com.softartdev.notedelight.shared.util.NapierKoinLogger
1617
import com.softartdev.notedelight.ui.MainRootUI
1718
import dev.icerock.moko.resources.desc.desc
1819
import io.github.aakira.napier.DebugAntilog
@@ -23,7 +24,7 @@ import org.koin.core.logger.Level
2324
fun main() {
2425
Napier.base(antilog = DebugAntilog())
2526
startKoin {
26-
printLogger(level = Level.DEBUG)
27+
logger(NapierKoinLogger(Level.DEBUG))
2728
modules(allModules)
2829
}
2930
val lifecycle = LifecycleRegistry()
65.3 KB
Binary file not shown.
4.19 KB
Binary file not shown.

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ targetSdk = "34"
44
minSdk = "21"
55

66
kotlin = "1.9.20"
7-
agp = "8.1.3"
7+
agp = "8.1.4"
88
gms = "4.3.15"
99
crashlytics = "2.9.8"
1010
compose = "1.5.10"

0 commit comments

Comments
 (0)