Skip to content

Commit 31edab9

Browse files
MV-GHMV-GH
authored
Bump dependencies (#80)
1 parent 37b7d67 commit 31edab9

File tree

10 files changed

+175
-302
lines changed

10 files changed

+175
-302
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ root = true
66
indent_size = 4
77
insert_final_newline = true
88
end_of_line = lf
9-
max_line_length = 140
9+
max_line_length = 200
1010

1111
ktlint_code_style = intellij_idea
1212
ktlint_standard_no-wildcard-imports = disabled
@@ -15,5 +15,6 @@ ktlint_standard_if-else-wrapping = disabled
1515
ktlint_standard_discouraged-comment-location = disabled
1616
ktlint_standard_max-line-length = disabled
1717
ktlint_standard_function-signature = disabled
18+
ktlint_standard_class-signature = disabled
1819
ktlint_standard_multiline-expression-wrapping = disabled
1920
ktlint_standard_string-template-indent = disabled

‎GeneratorScripts/build.gradle.kts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
kotlin("jvm")
3-
kotlin("plugin.serialization") version "2.0.20"
4-
id("com.google.devtools.ksp").version("2.0.21-1.0.25")
3+
kotlin("plugin.serialization") version "2.1.10"
4+
id("com.google.devtools.ksp").version("2.1.10-1.0.30")
55
}
66

77
repositories {
@@ -11,18 +11,18 @@ repositories {
1111
dependencies {
1212
testImplementation("org.jetbrains.kotlin:kotlin-test")
1313
implementation("com.charleskorn.kaml:kaml:0.55.0")
14-
val ktorVersion = "3.0.0"
14+
val ktorVersion = "3.1.0"
1515
val konvertVersion = "3.2.1"
1616
implementation("io.ktor:ktor-client-core:$ktorVersion")
1717
implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
1818
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
1919
implementation("io.ktor:ktor-client-logging:$ktorVersion")
2020

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

24-
implementation("com.squareup.okio:okio:3.9.1")
25-
implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.5.4")
24+
implementation("com.squareup.okio:okio:3.10.2")
25+
implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.6.0")
2626
implementation("io.mcarle:konvert:$konvertVersion")
2727
implementation("io.mcarle:konvert-api:$konvertVersion")
2828
implementation(project(":app"))

‎app/build.gradle.kts‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import org.jmailen.gradle.kotlinter.tasks.LintTask
55

66
plugins {
77
kotlin("multiplatform")
8-
kotlin("plugin.serialization") version "2.0.21"
9-
id("org.jmailen.kotlinter") version "4.4.0"
10-
id("com.google.devtools.ksp") version ("2.0.21-1.0.25")
8+
kotlin("plugin.serialization") version "2.1.10"
9+
id("org.jmailen.kotlinter") version "5.0.1"
10+
id("com.google.devtools.ksp") version ("2.1.10-1.0.30")
1111
id("com.vanniktech.maven.publish") version "0.29.0"
1212
id("com.github.ben-manes.versions") version "0.51.0"
1313
id("com.android.library")
@@ -22,7 +22,7 @@ repositories {
2222

2323
android {
2424
namespace = "it.vercruysse.lemmyapi"
25-
compileSdk = 34
25+
compileSdk = 35
2626
defaultConfig {
2727
minSdk = 21
2828
}
@@ -64,14 +64,17 @@ kotlin {
6464
}
6565
}
6666

67+
68+
69+
6770
sourceSets {
68-
val ktorVersion = "3.0.1"
71+
val ktorVersion = "3.1.0"
6972

7073

7174
commonMain.dependencies {
7275
implementation("io.ktor:ktor-client-core:$ktorVersion")
73-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
74-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
76+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
77+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
7578

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

8184
commonTest.dependencies {
8285
implementation(kotlin("test"))
83-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0")
86+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1")
8487
implementation("io.ktor:ktor-client-logging:$ktorVersion")
8588
}
8689

‎app/src/commonMain/kotlin/it/vercruysse/lemmyapi/v0/x18/x5/Transformer.kt‎

Lines changed: 24 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -686,8 +686,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
686686
admins = d.admins.map { this.toUni(d = it) },
687687
)
688688

689-
override fun toUni(d: X5DatatypesAddModToCommunityResponse):
690-
LemmyapiDatatypesAddModToCommunityResponse = LemmyapiDatatypesAddModToCommunityResponse(
689+
override fun toUni(d: X5DatatypesAddModToCommunityResponse): LemmyapiDatatypesAddModToCommunityResponse = LemmyapiDatatypesAddModToCommunityResponse(
691690
moderators = d.moderators.map { this.toUni(d = it) },
692691
)
693692

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

718-
override fun toUni(d: X5DatatypesAdminPurgeCommunityView):
719-
LemmyapiDatatypesAdminPurgeCommunityView = LemmyapiDatatypesAdminPurgeCommunityView(
717+
override fun toUni(d: X5DatatypesAdminPurgeCommunityView): LemmyapiDatatypesAdminPurgeCommunityView = LemmyapiDatatypesAdminPurgeCommunityView(
720718
admin_purge_community = this.toUni(d = d.admin_purge_community),
721719
admin = d.admin?.let { this.toUni(d = it) },
722720
)
@@ -751,8 +749,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
751749
community = this.toUni(d = d.community),
752750
)
753751

754-
override fun toUni(d: X5DatatypesBanFromCommunityResponse):
755-
LemmyapiDatatypesBanFromCommunityResponse = LemmyapiDatatypesBanFromCommunityResponse(
752+
override fun toUni(d: X5DatatypesBanFromCommunityResponse): LemmyapiDatatypesBanFromCommunityResponse = LemmyapiDatatypesBanFromCommunityResponse(
756753
person_view = this.toUni(d = d.person_view),
757754
banned = d.banned,
758755
)
@@ -951,16 +948,14 @@ internal class Transformer(var auth: String) : MapperGenerator {
951948
hidden_communities = d.hidden_communities.map { this.toUni(d = it) },
952949
)
953950

954-
override fun toUni(d: X5DatatypesGetPersonDetailsResponse):
955-
LemmyapiDatatypesGetPersonDetailsResponse = LemmyapiDatatypesGetPersonDetailsResponse(
951+
override fun toUni(d: X5DatatypesGetPersonDetailsResponse): LemmyapiDatatypesGetPersonDetailsResponse = LemmyapiDatatypesGetPersonDetailsResponse(
956952
person_view = this.toUni(d = d.person_view),
957953
comments = d.comments.map { this.toUni(d = it) },
958954
posts = d.posts.map { this.toUni(d = it) },
959955
moderates = d.moderates.map { this.toUni(d = it) },
960956
)
961957

962-
override fun toUni(d: X5DatatypesGetPersonMentionsResponse):
963-
LemmyapiDatatypesGetPersonMentionsResponse = LemmyapiDatatypesGetPersonMentionsResponse(
958+
override fun toUni(d: X5DatatypesGetPersonMentionsResponse): LemmyapiDatatypesGetPersonMentionsResponse = LemmyapiDatatypesGetPersonMentionsResponse(
964959
mentions = d.mentions.map { this.toUni(d = it) },
965960
)
966961

@@ -989,8 +984,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
989984
private_message_reports = d.private_message_reports,
990985
)
991986

992-
override fun toUni(d: X5DatatypesGetSiteMetadataResponse):
993-
LemmyapiDatatypesGetSiteMetadataResponse = LemmyapiDatatypesGetSiteMetadataResponse(
987+
override fun toUni(d: X5DatatypesGetSiteMetadataResponse): LemmyapiDatatypesGetSiteMetadataResponse = LemmyapiDatatypesGetSiteMetadataResponse(
994988
metadata = this.toUni(d = d.metadata),
995989
)
996990

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

1003-
override fun toUni(d: X5DatatypesGetUnreadRegistrationApplicationCountResponse):
1004-
LemmyapiDatatypesGetUnreadRegistrationApplicationCountResponse =
997+
override fun toUni(d: X5DatatypesGetUnreadRegistrationApplicationCountResponse): LemmyapiDatatypesGetUnreadRegistrationApplicationCountResponse =
1005998
LemmyapiDatatypesGetUnreadRegistrationApplicationCountResponse(
1006999
registration_applications = d.registration_applications,
10071000
)
@@ -1021,18 +1014,15 @@ internal class Transformer(var auth: String) : MapperGenerator {
10211014
name = d.name,
10221015
)
10231016

1024-
override fun toUni(d: X5DatatypesListCommentReportsResponse):
1025-
LemmyapiDatatypesListCommentReportsResponse = LemmyapiDatatypesListCommentReportsResponse(
1017+
override fun toUni(d: X5DatatypesListCommentReportsResponse): LemmyapiDatatypesListCommentReportsResponse = LemmyapiDatatypesListCommentReportsResponse(
10261018
comment_reports = d.comment_reports.map { this.toUni(d = it) },
10271019
)
10281020

1029-
override fun toUni(d: X5DatatypesListCommunitiesResponse):
1030-
LemmyapiDatatypesListCommunitiesResponse = LemmyapiDatatypesListCommunitiesResponse(
1021+
override fun toUni(d: X5DatatypesListCommunitiesResponse): LemmyapiDatatypesListCommunitiesResponse = LemmyapiDatatypesListCommunitiesResponse(
10311022
communities = d.communities.map { this.toUni(d = it) },
10321023
)
10331024

1034-
override fun toUni(d: X5DatatypesListPostReportsResponse):
1035-
LemmyapiDatatypesListPostReportsResponse = LemmyapiDatatypesListPostReportsResponse(
1025+
override fun toUni(d: X5DatatypesListPostReportsResponse): LemmyapiDatatypesListPostReportsResponse = LemmyapiDatatypesListPostReportsResponse(
10361026
post_reports = d.post_reports.map { this.toUni(d = it) },
10371027
)
10381028

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

1118-
override fun toUni(d: X5DatatypesModBanFromCommunityView):
1119-
LemmyapiDatatypesModBanFromCommunityView = LemmyapiDatatypesModBanFromCommunityView(
1108+
override fun toUni(d: X5DatatypesModBanFromCommunityView): LemmyapiDatatypesModBanFromCommunityView = LemmyapiDatatypesModBanFromCommunityView(
11201109
mod_ban_from_community = this.toUni(d = d.mod_ban_from_community),
11211110
moderator = d.moderator?.let { this.toUni(d = it) },
11221111
community = this.toUni(d = d.community),
@@ -1255,8 +1244,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
12551244
when_ = addTimezoneOffset(d.when_),
12561245
)
12571246

1258-
override fun toUni(d: X5DatatypesModTransferCommunityView):
1259-
LemmyapiDatatypesModTransferCommunityView = LemmyapiDatatypesModTransferCommunityView(
1247+
override fun toUni(d: X5DatatypesModTransferCommunityView): LemmyapiDatatypesModTransferCommunityView = LemmyapiDatatypesModTransferCommunityView(
12601248
mod_transfer_community = this.toUni(d = d.mod_transfer_community),
12611249
moderator = d.moderator?.let { this.toUni(d = it) },
12621250
community = this.toUni(d = d.community),
@@ -1396,13 +1384,11 @@ internal class Transformer(var auth: String) : MapperGenerator {
13961384
updated = d.updated,
13971385
)
13981386

1399-
override fun toUni(d: X5DatatypesPrivateMessageReportResponse):
1400-
LemmyapiDatatypesPrivateMessageReportResponse = LemmyapiDatatypesPrivateMessageReportResponse(
1387+
override fun toUni(d: X5DatatypesPrivateMessageReportResponse): LemmyapiDatatypesPrivateMessageReportResponse = LemmyapiDatatypesPrivateMessageReportResponse(
14011388
private_message_report_view = this.toUni(d = d.private_message_report_view),
14021389
)
14031390

1404-
override fun toUni(d: X5DatatypesPrivateMessageReportView):
1405-
LemmyapiDatatypesPrivateMessageReportView = LemmyapiDatatypesPrivateMessageReportView(
1391+
override fun toUni(d: X5DatatypesPrivateMessageReportView): LemmyapiDatatypesPrivateMessageReportView = LemmyapiDatatypesPrivateMessageReportView(
14061392
private_message_report = this.toUni(d = d.private_message_report),
14071393
private_message = this.toUni(d = d.private_message),
14081394
private_message_creator = this.toUni(d = d.private_message_creator),
@@ -1414,8 +1400,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
14141400
private_message_view = this.toUni(d = d.private_message_view),
14151401
)
14161402

1417-
override fun toUni(d: X5DatatypesPrivateMessagesResponse):
1418-
LemmyapiDatatypesPrivateMessagesResponse = LemmyapiDatatypesPrivateMessagesResponse(
1403+
override fun toUni(d: X5DatatypesPrivateMessagesResponse): LemmyapiDatatypesPrivateMessagesResponse = LemmyapiDatatypesPrivateMessagesResponse(
14191404
private_messages = d.private_messages.map { this.toUni(d = it) },
14201405
)
14211406

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

1429-
override fun toUni(d: X5DatatypesRegistrationApplication):
1430-
LemmyapiDatatypesRegistrationApplication = LemmyapiDatatypesRegistrationApplication(
1414+
override fun toUni(d: X5DatatypesRegistrationApplication): LemmyapiDatatypesRegistrationApplication = LemmyapiDatatypesRegistrationApplication(
14311415
id = d.id,
14321416
local_user_id = d.local_user_id,
14331417
answer = d.answer,
@@ -1441,8 +1425,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
14411425
registration_application = this.toUni(d = d.registration_application),
14421426
)
14431427

1444-
override fun toUni(d: X5DatatypesRegistrationApplicationView):
1445-
LemmyapiDatatypesRegistrationApplicationView = LemmyapiDatatypesRegistrationApplicationView(
1428+
override fun toUni(d: X5DatatypesRegistrationApplicationView): LemmyapiDatatypesRegistrationApplicationView = LemmyapiDatatypesRegistrationApplicationView(
14461429
registration_application = this.toUni(d = d.registration_application),
14471430
creator_local_user = this.toUni(d = d.creator_local_user),
14481431
creator = this.toUni(d = d.creator),
@@ -1531,8 +1514,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
15311514
auth = auth,
15321515
)
15331516

1534-
override fun fromUni(d: LemmyapiDatatypesApproveRegistrationApplication):
1535-
X5DatatypesApproveRegistrationApplication = X5DatatypesApproveRegistrationApplication(
1517+
override fun fromUni(d: LemmyapiDatatypesApproveRegistrationApplication): X5DatatypesApproveRegistrationApplication = X5DatatypesApproveRegistrationApplication(
15361518
id = d.id,
15371519
approve = d.approve,
15381520
deny_reason = d.deny_reason,
@@ -1660,8 +1642,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
16601642
auth = auth,
16611643
)
16621644

1663-
override fun fromUni(d: LemmyapiDatatypesCreatePrivateMessageReport):
1664-
X5DatatypesCreatePrivateMessageReport = X5DatatypesCreatePrivateMessageReport(
1645+
override fun fromUni(d: LemmyapiDatatypesCreatePrivateMessageReport): X5DatatypesCreatePrivateMessageReport = X5DatatypesCreatePrivateMessageReport(
16651646
private_message_id = d.private_message_id,
16661647
reason = d.reason,
16671648
auth = auth,
@@ -2005,16 +1986,14 @@ internal class Transformer(var auth: String) : MapperGenerator {
20051986
auth = auth,
20061987
)
20071988

2008-
override fun fromUni(d: LemmyapiDatatypesListPrivateMessageReports):
2009-
X5DatatypesListPrivateMessageReports = X5DatatypesListPrivateMessageReports(
1989+
override fun fromUni(d: LemmyapiDatatypesListPrivateMessageReports): X5DatatypesListPrivateMessageReports = X5DatatypesListPrivateMessageReports(
20101990
page = d.page,
20111991
limit = d.limit,
20121992
unresolved_only = d.unresolved_only,
20131993
auth = auth,
20141994
)
20151995

2016-
override fun fromUni(d: LemmyapiDatatypesListRegistrationApplications):
2017-
X5DatatypesListRegistrationApplications = X5DatatypesListRegistrationApplications(
1996+
override fun fromUni(d: LemmyapiDatatypesListRegistrationApplications): X5DatatypesListRegistrationApplications = X5DatatypesListRegistrationApplications(
20181997
unread_only = d.unread_only,
20191998
page = d.page,
20201999
limit = d.limit,
@@ -2045,15 +2024,13 @@ internal class Transformer(var auth: String) : MapperGenerator {
20452024
auth = auth,
20462025
)
20472026

2048-
override fun fromUni(d: LemmyapiDatatypesMarkPrivateMessageAsRead):
2049-
X5DatatypesMarkPrivateMessageAsRead = X5DatatypesMarkPrivateMessageAsRead(
2027+
override fun fromUni(d: LemmyapiDatatypesMarkPrivateMessageAsRead): X5DatatypesMarkPrivateMessageAsRead = X5DatatypesMarkPrivateMessageAsRead(
20502028
private_message_id = d.private_message_id,
20512029
read = d.read,
20522030
auth = auth,
20532031
)
20542032

2055-
override fun fromUni(d: LemmyapiDatatypesPasswordChangeAfterReset):
2056-
X5DatatypesPasswordChangeAfterReset = X5DatatypesPasswordChangeAfterReset(
2033+
override fun fromUni(d: LemmyapiDatatypesPasswordChangeAfterReset): X5DatatypesPasswordChangeAfterReset = X5DatatypesPasswordChangeAfterReset(
20572034
token = d.token,
20582035
password = d.password,
20592036
password_verify = d.password_verify,
@@ -2147,8 +2124,7 @@ internal class Transformer(var auth: String) : MapperGenerator {
21472124
auth = auth,
21482125
)
21492126

2150-
override fun fromUni(d: LemmyapiDatatypesResolvePrivateMessageReport):
2151-
X5DatatypesResolvePrivateMessageReport = X5DatatypesResolvePrivateMessageReport(
2127+
override fun fromUni(d: LemmyapiDatatypesResolvePrivateMessageReport): X5DatatypesResolvePrivateMessageReport = X5DatatypesResolvePrivateMessageReport(
21522128
report_id = d.report_id,
21532129
resolved = d.resolved,
21542130
auth = auth,

0 commit comments

Comments
 (0)