Skip to content

Bump dependencies #80

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.

Sign up for GitHub

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

Merged
MV-GH merged 2 commits into from
Feb 17, 2025
Merged

Bump dependencies #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
889e604
Bump dependencies
MV-GH Feb 16, 2025
2834a58
Fix lint issues
MV-GH Feb 17, 2025
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
3 changes: 2 additions & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ root = true
indent_size = 4
insert_final_newline = true
end_of_line = lf
max_line_length = 140
max_line_length = 200

ktlint_code_style = intellij_idea
ktlint_standard_no-wildcard-imports = disabled
Expand All @@ -15,5 +15,6 @@ ktlint_standard_if-else-wrapping = disabled
ktlint_standard_discouraged-comment-location = disabled
ktlint_standard_max-line-length = disabled
ktlint_standard_function-signature = disabled
ktlint_standard_class-signature = disabled
ktlint_standard_multiline-expression-wrapping = disabled
ktlint_standard_string-template-indent = disabled
14 changes: 7 additions & 7 deletions GeneratorScripts/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
kotlin("jvm")
kotlin("plugin.serialization") version "2.0.20"
id("com.google.devtools.ksp").version("2.0.21-1.0.25")
kotlin("plugin.serialization") version "2.1.10"
id("com.google.devtools.ksp").version("2.1.10-1.0.30")
}

repositories {
Expand All @@ -11,18 +11,18 @@ repositories {
dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test")
implementation("com.charleskorn.kaml:kaml:0.55.0")
val ktorVersion = "3.0.0"
val ktorVersion = "3.1.0"
val konvertVersion = "3.2.1"
implementation("io.ktor:ktor-client-core:$ktorVersion")
implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
implementation("io.ktor:ktor-client-logging:$ktorVersion")

implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")

implementation("com.squareup.okio:okio:3.9.1")
implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.5.4")
implementation("com.squareup.okio:okio:3.10.2")
implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.6.0")
implementation("io.mcarle:konvert:$konvertVersion")
implementation("io.mcarle:konvert-api:$konvertVersion")
implementation(project(":app"))
Expand Down
19 changes: 11 additions & 8 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import org.jmailen.gradle.kotlinter.tasks.LintTask

plugins {
kotlin("multiplatform")
kotlin("plugin.serialization") version "2.0.21"
id("org.jmailen.kotlinter") version "4.4.0"
id("com.google.devtools.ksp") version ("2.0.21-1.0.25")
kotlin("plugin.serialization") version "2.1.10"
id("org.jmailen.kotlinter") version "5.0.1"
id("com.google.devtools.ksp") version ("2.1.10-1.0.30")
id("com.vanniktech.maven.publish") version "0.29.0"
id("com.github.ben-manes.versions") version "0.51.0"
id("com.android.library")
Expand All @@ -22,7 +22,7 @@ repositories {

android {
namespace = "it.vercruysse.lemmyapi"
compileSdk = 34
compileSdk = 35
defaultConfig {
minSdk = 21
}
Expand Down Expand Up @@ -64,14 +64,17 @@ kotlin {
}
}




sourceSets {
val ktorVersion = "3.0.1"
val ktorVersion = "3.1.0"


commonMain.dependencies {
implementation("io.ktor:ktor-client-core:$ktorVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")

implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
Expand All @@ -80,7 +83,7 @@ kotlin {

commonTest.dependencies {
implementation(kotlin("test"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1")
implementation("io.ktor:ktor-client-logging:$ktorVersion")
}

Expand Down
72 changes: 24 additions & 48 deletions app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0/x18/x5/Transformer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,8 +686,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
admins = d.admins.map { this.toUni(d = it) },
)

override fun toUni(d: X5DatatypesAddModToCommunityResponse):
LemmyapiDatatypesAddModToCommunityResponse = LemmyapiDatatypesAddModToCommunityResponse(
override fun toUni(d: X5DatatypesAddModToCommunityResponse): LemmyapiDatatypesAddModToCommunityResponse = LemmyapiDatatypesAddModToCommunityResponse(
moderators = d.moderators.map { this.toUni(d = it) },
)

Expand Down Expand Up @@ -715,8 +714,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
when_ = addTimezoneOffset(d.when_),
)

override fun toUni(d: X5DatatypesAdminPurgeCommunityView):
LemmyapiDatatypesAdminPurgeCommunityView = LemmyapiDatatypesAdminPurgeCommunityView(
override fun toUni(d: X5DatatypesAdminPurgeCommunityView): LemmyapiDatatypesAdminPurgeCommunityView = LemmyapiDatatypesAdminPurgeCommunityView(
admin_purge_community = this.toUni(d = d.admin_purge_community),
admin = d.admin?.let { this.toUni(d = it) },
)
Expand Down Expand Up @@ -751,8 +749,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
community = this.toUni(d = d.community),
)

override fun toUni(d: X5DatatypesBanFromCommunityResponse):
LemmyapiDatatypesBanFromCommunityResponse = LemmyapiDatatypesBanFromCommunityResponse(
override fun toUni(d: X5DatatypesBanFromCommunityResponse): LemmyapiDatatypesBanFromCommunityResponse = LemmyapiDatatypesBanFromCommunityResponse(
person_view = this.toUni(d = d.person_view),
banned = d.banned,
)
Expand Down Expand Up @@ -951,16 +948,14 @@ internal class Transformer(var auth: String) : MapperGenerator {
hidden_communities = d.hidden_communities.map { this.toUni(d = it) },
)

override fun toUni(d: X5DatatypesGetPersonDetailsResponse):
LemmyapiDatatypesGetPersonDetailsResponse = LemmyapiDatatypesGetPersonDetailsResponse(
override fun toUni(d: X5DatatypesGetPersonDetailsResponse): LemmyapiDatatypesGetPersonDetailsResponse = LemmyapiDatatypesGetPersonDetailsResponse(
person_view = this.toUni(d = d.person_view),
comments = d.comments.map { this.toUni(d = it) },
posts = d.posts.map { this.toUni(d = it) },
moderates = d.moderates.map { this.toUni(d = it) },
)

override fun toUni(d: X5DatatypesGetPersonMentionsResponse):
LemmyapiDatatypesGetPersonMentionsResponse = LemmyapiDatatypesGetPersonMentionsResponse(
override fun toUni(d: X5DatatypesGetPersonMentionsResponse): LemmyapiDatatypesGetPersonMentionsResponse = LemmyapiDatatypesGetPersonMentionsResponse(
mentions = d.mentions.map { this.toUni(d = it) },
)

Expand Down Expand Up @@ -989,8 +984,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
private_message_reports = d.private_message_reports,
)

override fun toUni(d: X5DatatypesGetSiteMetadataResponse):
LemmyapiDatatypesGetSiteMetadataResponse = LemmyapiDatatypesGetSiteMetadataResponse(
override fun toUni(d: X5DatatypesGetSiteMetadataResponse): LemmyapiDatatypesGetSiteMetadataResponse = LemmyapiDatatypesGetSiteMetadataResponse(
metadata = this.toUni(d = d.metadata),
)

Expand All @@ -1000,8 +994,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
private_messages = d.private_messages,
)

override fun toUni(d: X5DatatypesGetUnreadRegistrationApplicationCountResponse):
LemmyapiDatatypesGetUnreadRegistrationApplicationCountResponse =
override fun toUni(d: X5DatatypesGetUnreadRegistrationApplicationCountResponse): LemmyapiDatatypesGetUnreadRegistrationApplicationCountResponse =
LemmyapiDatatypesGetUnreadRegistrationApplicationCountResponse(
registration_applications = d.registration_applications,
)
Expand All @@ -1021,18 +1014,15 @@ internal class Transformer(var auth: String) : MapperGenerator {
name = d.name,
)

override fun toUni(d: X5DatatypesListCommentReportsResponse):
LemmyapiDatatypesListCommentReportsResponse = LemmyapiDatatypesListCommentReportsResponse(
override fun toUni(d: X5DatatypesListCommentReportsResponse): LemmyapiDatatypesListCommentReportsResponse = LemmyapiDatatypesListCommentReportsResponse(
comment_reports = d.comment_reports.map { this.toUni(d = it) },
)

override fun toUni(d: X5DatatypesListCommunitiesResponse):
LemmyapiDatatypesListCommunitiesResponse = LemmyapiDatatypesListCommunitiesResponse(
override fun toUni(d: X5DatatypesListCommunitiesResponse): LemmyapiDatatypesListCommunitiesResponse = LemmyapiDatatypesListCommunitiesResponse(
communities = d.communities.map { this.toUni(d = it) },
)

override fun toUni(d: X5DatatypesListPostReportsResponse):
LemmyapiDatatypesListPostReportsResponse = LemmyapiDatatypesListPostReportsResponse(
override fun toUni(d: X5DatatypesListPostReportsResponse): LemmyapiDatatypesListPostReportsResponse = LemmyapiDatatypesListPostReportsResponse(
post_reports = d.post_reports.map { this.toUni(d = it) },
)

Expand Down Expand Up @@ -1115,8 +1105,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
when_ = addTimezoneOffset(d.when_),
)

override fun toUni(d: X5DatatypesModBanFromCommunityView):
LemmyapiDatatypesModBanFromCommunityView = LemmyapiDatatypesModBanFromCommunityView(
override fun toUni(d: X5DatatypesModBanFromCommunityView): LemmyapiDatatypesModBanFromCommunityView = LemmyapiDatatypesModBanFromCommunityView(
mod_ban_from_community = this.toUni(d = d.mod_ban_from_community),
moderator = d.moderator?.let { this.toUni(d = it) },
community = this.toUni(d = d.community),
Expand Down Expand Up @@ -1255,8 +1244,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
when_ = addTimezoneOffset(d.when_),
)

override fun toUni(d: X5DatatypesModTransferCommunityView):
LemmyapiDatatypesModTransferCommunityView = LemmyapiDatatypesModTransferCommunityView(
override fun toUni(d: X5DatatypesModTransferCommunityView): LemmyapiDatatypesModTransferCommunityView = LemmyapiDatatypesModTransferCommunityView(
mod_transfer_community = this.toUni(d = d.mod_transfer_community),
moderator = d.moderator?.let { this.toUni(d = it) },
community = this.toUni(d = d.community),
Expand Down Expand Up @@ -1396,13 +1384,11 @@ internal class Transformer(var auth: String) : MapperGenerator {
updated = d.updated,
)

override fun toUni(d: X5DatatypesPrivateMessageReportResponse):
LemmyapiDatatypesPrivateMessageReportResponse = LemmyapiDatatypesPrivateMessageReportResponse(
override fun toUni(d: X5DatatypesPrivateMessageReportResponse): LemmyapiDatatypesPrivateMessageReportResponse = LemmyapiDatatypesPrivateMessageReportResponse(
private_message_report_view = this.toUni(d = d.private_message_report_view),
)

override fun toUni(d: X5DatatypesPrivateMessageReportView):
LemmyapiDatatypesPrivateMessageReportView = LemmyapiDatatypesPrivateMessageReportView(
override fun toUni(d: X5DatatypesPrivateMessageReportView): LemmyapiDatatypesPrivateMessageReportView = LemmyapiDatatypesPrivateMessageReportView(
private_message_report = this.toUni(d = d.private_message_report),
private_message = this.toUni(d = d.private_message),
private_message_creator = this.toUni(d = d.private_message_creator),
Expand All @@ -1414,8 +1400,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
private_message_view = this.toUni(d = d.private_message_view),
)

override fun toUni(d: X5DatatypesPrivateMessagesResponse):
LemmyapiDatatypesPrivateMessagesResponse = LemmyapiDatatypesPrivateMessagesResponse(
override fun toUni(d: X5DatatypesPrivateMessagesResponse): LemmyapiDatatypesPrivateMessagesResponse = LemmyapiDatatypesPrivateMessagesResponse(
private_messages = d.private_messages.map { this.toUni(d = it) },
)

Expand All @@ -1426,8 +1411,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
recipient = this.toUni(d = d.recipient),
)

override fun toUni(d: X5DatatypesRegistrationApplication):
LemmyapiDatatypesRegistrationApplication = LemmyapiDatatypesRegistrationApplication(
override fun toUni(d: X5DatatypesRegistrationApplication): LemmyapiDatatypesRegistrationApplication = LemmyapiDatatypesRegistrationApplication(
id = d.id,
local_user_id = d.local_user_id,
answer = d.answer,
Expand All @@ -1441,8 +1425,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
registration_application = this.toUni(d = d.registration_application),
)

override fun toUni(d: X5DatatypesRegistrationApplicationView):
LemmyapiDatatypesRegistrationApplicationView = LemmyapiDatatypesRegistrationApplicationView(
override fun toUni(d: X5DatatypesRegistrationApplicationView): LemmyapiDatatypesRegistrationApplicationView = LemmyapiDatatypesRegistrationApplicationView(
registration_application = this.toUni(d = d.registration_application),
creator_local_user = this.toUni(d = d.creator_local_user),
creator = this.toUni(d = d.creator),
Expand Down Expand Up @@ -1531,8 +1514,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
auth = auth,
)

override fun fromUni(d: LemmyapiDatatypesApproveRegistrationApplication):
X5DatatypesApproveRegistrationApplication = X5DatatypesApproveRegistrationApplication(
override fun fromUni(d: LemmyapiDatatypesApproveRegistrationApplication): X5DatatypesApproveRegistrationApplication = X5DatatypesApproveRegistrationApplication(
id = d.id,
approve = d.approve,
deny_reason = d.deny_reason,
Expand Down Expand Up @@ -1660,8 +1642,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
auth = auth,
)

override fun fromUni(d: LemmyapiDatatypesCreatePrivateMessageReport):
X5DatatypesCreatePrivateMessageReport = X5DatatypesCreatePrivateMessageReport(
override fun fromUni(d: LemmyapiDatatypesCreatePrivateMessageReport): X5DatatypesCreatePrivateMessageReport = X5DatatypesCreatePrivateMessageReport(
private_message_id = d.private_message_id,
reason = d.reason,
auth = auth,
Expand Down Expand Up @@ -2005,16 +1986,14 @@ internal class Transformer(var auth: String) : MapperGenerator {
auth = auth,
)

override fun fromUni(d: LemmyapiDatatypesListPrivateMessageReports):
X5DatatypesListPrivateMessageReports = X5DatatypesListPrivateMessageReports(
override fun fromUni(d: LemmyapiDatatypesListPrivateMessageReports): X5DatatypesListPrivateMessageReports = X5DatatypesListPrivateMessageReports(
page = d.page,
limit = d.limit,
unresolved_only = d.unresolved_only,
auth = auth,
)

override fun fromUni(d: LemmyapiDatatypesListRegistrationApplications):
X5DatatypesListRegistrationApplications = X5DatatypesListRegistrationApplications(
override fun fromUni(d: LemmyapiDatatypesListRegistrationApplications): X5DatatypesListRegistrationApplications = X5DatatypesListRegistrationApplications(
unread_only = d.unread_only,
page = d.page,
limit = d.limit,
Expand Down Expand Up @@ -2045,15 +2024,13 @@ internal class Transformer(var auth: String) : MapperGenerator {
auth = auth,
)

override fun fromUni(d: LemmyapiDatatypesMarkPrivateMessageAsRead):
X5DatatypesMarkPrivateMessageAsRead = X5DatatypesMarkPrivateMessageAsRead(
override fun fromUni(d: LemmyapiDatatypesMarkPrivateMessageAsRead): X5DatatypesMarkPrivateMessageAsRead = X5DatatypesMarkPrivateMessageAsRead(
private_message_id = d.private_message_id,
read = d.read,
auth = auth,
)

override fun fromUni(d: LemmyapiDatatypesPasswordChangeAfterReset):
X5DatatypesPasswordChangeAfterReset = X5DatatypesPasswordChangeAfterReset(
override fun fromUni(d: LemmyapiDatatypesPasswordChangeAfterReset): X5DatatypesPasswordChangeAfterReset = X5DatatypesPasswordChangeAfterReset(
token = d.token,
password = d.password,
password_verify = d.password_verify,
Expand Down Expand Up @@ -2147,8 +2124,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
auth = auth,
)

override fun fromUni(d: LemmyapiDatatypesResolvePrivateMessageReport):
X5DatatypesResolvePrivateMessageReport = X5DatatypesResolvePrivateMessageReport(
override fun fromUni(d: LemmyapiDatatypesResolvePrivateMessageReport): X5DatatypesResolvePrivateMessageReport = X5DatatypesResolvePrivateMessageReport(
report_id = d.report_id,
resolved = d.resolved,
auth = auth,
Expand Down
Loading
Loading