Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addig user management to ZeServer #253

Merged
merged 26 commits into from
Jun 30, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
57c7ed4
Addig user management to ZeServer
mariobodemann Jun 25, 2024
01ab007
Adding ZePass
mariobodemann Jun 25, 2024
acacbf7
Add flashing tool
mariobodemann Jun 25, 2024
0bbcd0f
fix vim issue with vim
mariobodemann Jun 27, 2024
4eee802
Another unused const removed
mariobodemann Jun 28, 2024
722d3e3
Downgrade to agp
mariobodemann Jun 28, 2024
167de50
add ai framework and initial name generation
mariobodemann Jun 28, 2024
df48f64
add gemini for descriptions
mariobodemann Jun 28, 2024
3d686ac
Add user image generation.
mariobodemann Jun 28, 2024
8e41690
Fix: Empty line in names.txt.
mariobodemann Jun 28, 2024
92fc898
Minor tweaks to image generation
mariobodemann Jun 29, 2024
93ba3fa
Simpify config submission from badge to app
mariobodemann Jun 29, 2024
fbdf5ea
Bump MockK version
milosmns Jun 29, 2024
42a42b2
Add badge config parser
milosmns Jun 29, 2024
8984a36
Update badge manager to use the latest parser
milosmns Jun 29, 2024
f58822b
Resize images and store pngs
mariobodemann Jun 29, 2024
86770df
update parsing of server for flashing
mariobodemann Jun 29, 2024
ea17b49
updating ai generations
mariobodemann Jun 30, 2024
d88add2
fix flashing minor bugs
mariobodemann Jun 30, 2024
0f44b47
adding non ssl version of server
mariobodemann Jun 30, 2024
2ad29f1
update zebadge to connect to server,
mariobodemann Jun 30, 2024
0cdab4c
ZePass: Fetch posted messages
mariobodemann Jun 30, 2024
9a2c602
Server: ZePass optimize response for zebadge
mariobodemann Jun 30, 2024
d6cf9bb
fix: remove stupid file handling
mariobodemann Jun 30, 2024
5910c8e
remove annyoing debug message
mariobodemann Jun 30, 2024
5858f13
ZEPASS!!!!
mariobodemann Jun 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bump MockK version
milosmns committed Jun 29, 2024
commit fbdf5eaaccd3d48acc5715e750433b67a1368754
53 changes: 32 additions & 21 deletions zeapp/android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -118,10 +118,11 @@ android {
kotlinOptions {
jvmTarget = "1.8"

freeCompilerArgs += listOf(
"-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
"-opt-in=androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi",
)
freeCompilerArgs +=
listOf(
"-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
"-opt-in=androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi",
)
}

buildFeatures {
@@ -130,18 +131,21 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
kotlinCompilerExtensionVersion =
libs.versions.androidx.compose.compiler
.get()
}

packaging {
resources {
excludes += arrayOf(
"META-INF/AL2.0",
"META-INF/LGPL2.1",
"META-INF/*.kotlin_module",
"META-INF/LICENSE.*",
"META-INF/LICENSE-notice.*",
)
excludes +=
arrayOf(
"META-INF/AL2.0",
"META-INF/LGPL2.1",
"META-INF/*.kotlin_module",
"META-INF/LICENSE.*",
"META-INF/LICENSE-notice.*",
)
}
}
}
@@ -219,19 +223,26 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs::class).confi

tasks.create("generateContributorsAsset") {
val command = "git shortlog -sne --all"
val process = ProcessBuilder()
.command(command.split(" "))
.directory(rootProject.projectDir)
.redirectOutput(Redirect.PIPE)
.redirectError(Redirect.PIPE)
.start()
val process =
ProcessBuilder()
.command(command.split(" "))
.directory(rootProject.projectDir)
.redirectOutput(Redirect.PIPE)
.redirectError(Redirect.PIPE)
.start()
process.waitFor(60, TimeUnit.SECONDS)
val result = process.inputStream.bufferedReader().readText()

val contributors = result.lines()
.joinToString(separator = System.lineSeparator()) { it.substringAfter("\t") }
val contributors =
result
.lines()
.joinToString(separator = System.lineSeparator()) { it.substringAfter("\t") }

val assetDir = layout.buildDirectory.dir("generated/assets").get().asFile
val assetDir =
layout.buildDirectory
.dir("generated/assets")
.get()
.asFile
assetDir.createDirectory()
File(assetDir, "test.txt").writeText(contributors)
}
2 changes: 1 addition & 1 deletion zeapp/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ junit4 = "4.13.2"
junit4-ui = "1.6.4"
ktor = "2.3.9"
uiTestManifest = "1.6.4"
mockk = "1.13.8"
mockk = "1.13.11"
kotlinxCoroutinesTest = "1.7.3"

[libraries]