Skip to content

Replace :core:proto with org.meshtastic:protobufs:2.7.25-SNAPSHOT #5675

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

Draft
jamesarich wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Replace :core:proto with org.meshtastic:protobufs:2.7.25-SNAPSHOT #5675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions .gitmodules
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ dependencies {
implementation(projects.core.network)
implementation(projects.core.nfc)
implementation(projects.core.prefs)
implementation(projects.core.proto)
implementation(libs.meshtastic.protobufs)
implementation(projects.core.service)
implementation(projects.core.resources)
implementation(projects.core.ui)
Expand Down
8 changes: 3 additions & 5 deletions build-logic/convention/src/main/kotlin/RootConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ private val ALL_MODULES_FULL =
":core:network",
":core:nfc",
":core:prefs",
":core:proto",
":core:repository",
":core:service",
":core:resources",
Expand All @@ -118,11 +117,10 @@ private val ALL_MODULES_FULL =
private val ANDROID_ONLY_MODULES = setOf(":androidApp", ":core:api", ":core:barcode", ":feature:widget")

/**
* Modules excluded from Dokka aggregation. :core:proto contains only auto-generated Wire classes (no KDoc value) and
* its TAKPacket-SDK dependency doesn't publish iOS metadata JARs, causing `transformCommonMainDependenciesMetadata` to
* fail during Dokka resolution.
* Modules excluded from Dokka aggregation. Empty now that :core:proto has been replaced by
* the external org.meshtastic:protobufs SDK.
*/
private val DOKKA_EXCLUDED_MODULES = setOf(":core:proto")
private val DOKKA_EXCLUDED_MODULES = emptySet<String>()

private fun allModules(): List<String> = ALL_MODULES_FULL

Expand Down
2 changes: 1 addition & 1 deletion core/data/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ kotlin {
implementation(projects.core.model)
implementation(projects.core.network)
implementation(projects.core.prefs)
implementation(projects.core.proto)
implementation(libs.meshtastic.protobufs)
implementation(projects.core.takserver)

implementation(libs.jetbrains.lifecycle.runtime)
Expand Down
2 changes: 1 addition & 1 deletion core/database/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ kotlin {
api(projects.core.common)
implementation(projects.core.di)
api(projects.core.model)
implementation(projects.core.proto)
implementation(libs.meshtastic.protobufs)
implementation(projects.core.resources)
implementation(libs.androidx.room.paging)
implementation(libs.kotlinx.serialization.json)
Expand Down
2 changes: 1 addition & 1 deletion core/datastore/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ kotlin {
commonMain.dependencies {
implementation(projects.core.common)
implementation(projects.core.model)
implementation(projects.core.proto)
implementation(libs.meshtastic.protobufs)
api(libs.androidx.datastore)
api(libs.androidx.datastore.preferences)
implementation(libs.kotlinx.serialization.json)
Expand Down
2 changes: 1 addition & 1 deletion core/domain/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ kotlin {
commonMain.dependencies {
implementation(projects.core.repository)
implementation(projects.core.model)
implementation(projects.core.proto)
implementation(libs.meshtastic.protobufs)
implementation(projects.core.common)
implementation(projects.core.database)
implementation(projects.core.datastore)
Expand Down
6 changes: 5 additions & 1 deletion core/model/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ kotlin {

sourceSets {
commonMain.dependencies {
api(projects.core.proto)
api(libs.meshtastic.protobufs)
api(libs.takpacket.sdk.kmp.get().toString()) {
exclude(group = "com.github.luben", module = "zstd-jni")
exclude(group = "org.ogce", module = "xpp3")
}
api(projects.core.common)
api(projects.core.resources)

Expand Down
2 changes: 1 addition & 1 deletion core/network/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ kotlin {
implementation(projects.core.common)
implementation(projects.core.di)
implementation(projects.core.model)
implementation(projects.core.proto)
implementation(libs.meshtastic.protobufs)
implementation(projects.core.ble)

implementation(libs.okio)
Expand Down
44 changes: 0 additions & 44 deletions core/proto/README.md
View file
Open in desktop

This file was deleted.

145 changes: 0 additions & 145 deletions core/proto/build.gradle.kts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion core/proto/src/main/proto
Open in desktop
Submodule proto deleted from a0a223
Loading
Loading