Skip to content

Commit dd5d64d

Browse files
committed
revert jar list change
1 parent d25eff2 commit dd5d64d

File tree

2 files changed

+1
-65
lines changed

2 files changed

+1
-65
lines changed

build.gradle.kts

Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -145,74 +145,12 @@ publishing {
145145
}
146146
}
147147

148-
/**
149-
* List of aar files to include in the jar. Some jars are being omitted because they are not needed for the JVM.
150-
* - lifecycle-*: exclude lifecycle libs due to https://github.com/GitLiveApp/firebase-java-sdk/pull/15 - remove the exclude once the dependencies in the aars are updated to the required version
151-
* - savedstate: Excluded due to this library already being included as part of the compose mutliplatform dependencies. It does not seem to be directly needed by the firebase libraries.
152-
*/
153-
val includeList = listOf(
154-
"activity-*.jar",
155-
"asynclayoutinflater-*.jar",
156-
"coordinatorlayout-*.jar",
157-
"core-*.jar",
158-
"core-runtime-*.jar",
159-
"cursoradapter-*.jar",
160-
"customview-*.jar",
161-
"documentfile-*.jar",
162-
"drawerlayout-*.jar",
163-
"firebase-abt-*.jar",
164-
"firebase-appcheck-*.jar",
165-
"firebase-appcheck-interop-*.jar",
166-
"firebase-auth-interop-*.jar",
167-
"firebase-common-*.jar",
168-
"firebase-common-*.jar",
169-
"firebase-common-ktx-*.jar",
170-
"firebase-common-ktx-*.jar",
171-
"firebase-components-*.jar",
172-
"firebase-components-*.jar",
173-
"firebase-config-*.jar",
174-
"firebase-config-interop-*.jar",
175-
"firebase-database-*.jar",
176-
"firebase-database-collection-*.jar",
177-
"firebase-encoders-json-*.jar",
178-
"firebase-firestore-*.jar",
179-
"firebase-functions-*.jar",
180-
"firebase-iid-*.jar",
181-
"firebase-iid-interop-*.jar",
182-
"firebase-installations-*.jar",
183-
"firebase-installations-interop-*.jar",
184-
"firebase-measurement-connector-*.jar",
185-
"firebase-storage-*.jar",
186-
"fragment-*.jar",
187-
"fragment-*.jar",
188-
"grpc-android-*.jar",
189-
"interpolator-*.jar",
190-
"legacy-support-core-ui-*.jar",
191-
"legacy-support-core-utils-*.jar",
192-
"loader-*.jar",
193-
"localbroadcastmanager-*.jar",
194-
"play-services-base-*.jar",
195-
"play-services-basement-*.jar",
196-
"play-services-basement-*.jar",
197-
"play-services-cloud-messaging-*.jar",
198-
"play-services-stats-*.jar",
199-
"play-services-tasks-*.jar",
200-
"play-services-tasks-*.jar",
201-
"print-*.jar",
202-
"protolite-well-known-types-*.jar",
203-
"slidingpanelayout-*.jar",
204-
"swiperefreshlayout-*.jar",
205-
"versionedparcelable-*.jar",
206-
"viewpager-*.jar"
207-
)
208-
209148
dependencies {
210149
compileOnly(libs.robolectric.android.all)
211150
testImplementation(libs.junit)
212151
testImplementation(libs.kotlinx.coroutines.play.services)
213152
testImplementation(libs.kotlinx.coroutines.swing)
214153
testImplementation(libs.kotlinx.coroutines.test)
215-
testImplementation(libs.mockito.core)
216154
// firebase aars
217155
aar(platform(libs.google.firebase.bom))
218156
aar(libs.google.firebase.firestore)
@@ -222,7 +160,7 @@ dependencies {
222160
aar(libs.google.firebase.installations)
223161
aar(libs.google.firebase.storage)
224162
// extracted aar dependencies
225-
api(fileTree(mapOf("dir" to "build/jar", "include" to includeList)))
163+
api(fileTree(mapOf("dir" to "build/jar", "include" to listOf("*.jar"), "exclude" to listOf("lifecycle-*"))))
226164
// polyfill dependencies
227165
implementation(libs.kotlinx.coroutines.core)
228166
implementation(libs.kotlinx.serialization.core)

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ kotlin = "2.0.20"
88
kotlinx-coroutines = "1.8.1"
99
kotlinx-serialization = "1.7.2"
1010
ktlint = "0.47.1"
11-
mockito = "5.12.0"
1211

1312
[libraries]
1413
androidx-collection = { module = "androidx.collection:collection", version = "1.4.3" }
@@ -32,7 +31,6 @@ kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-
3231
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
3332
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
3433
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
35-
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
3634
okhttp = { module = "com.squareup.okhttp3:okhttp", version = "3.12.13" }
3735
robolectric-android-all = { module = "org.robolectric:android-all", version = "14-robolectric-10818077" }
3836
xerial-sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version = "3.46.1.0" }

0 commit comments

Comments
 (0)