Skip to content

Commit 527a7e1

Browse files
committed
Revert "chore(deps): [WPB-9777] upgrade AboutLibraries to 12.2.4 πŸ’ (#4298)"
This reverts commit 2cc0d61.
1 parent b4c3e63 commit 527a7e1

File tree

10 files changed

+17
-15
lines changed

10 files changed

+17
-15
lines changed

β€Ž.github/workflows/build-unified.ymlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
# AboutLibraries seems to go crazy when running lint checks. So we explicitly don't run it.
3535
env:
3636
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-XX:MaxMetaspaceSize=1g -Xmx4G"'
37+
DISABLE_ABOUT_LIBRARIES: TRUE
3738
steps:
3839
- name: Checkout
3940
uses: actions/checkout@v4

β€Ž.github/workflows/code-analysis.ymlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
# AboutLibraries seems to go crazy when running lint checks. So we explicitly don't run it.
1414
env:
1515
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-XX:MaxMetaspaceSize=1g -Xmx2G"'
16+
DISABLE_ABOUT_LIBRARIES: TRUE
1617
steps:
1718
- name: Checkout
1819
uses: actions/checkout@v4

β€Ž.github/workflows/gradle-run-unit-tests.ymlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
coverage:
1818
env:
1919
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-XX:MaxMetaspaceSize=2g -Xmx4G"'
20+
DISABLE_ABOUT_LIBRARIES: TRUE
2021
runs-on: buildjet-8vcpu-ubuntu-2204
2122
steps:
2223
- name: Checkout

β€Žapp/build.gradle.ktsβ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,9 @@ android {
138138
}
139139

140140
aboutLibraries {
141-
android.registerAndroidTasks = true
142-
export.excludeFields.add("generated")
141+
val isAboutLibrariesDisabled = System.getenv("DISABLE_ABOUT_LIBRARIES")?.equals("true", true) ?: false
142+
registerAndroidTasks = !isAboutLibrariesDisabled
143+
excludeFields = arrayOf("generated")
143144
}
144145

145146
dependencies {
@@ -264,8 +265,7 @@ dependencies {
264265
implementation(libs.commonmark.tables)
265266

266267
implementation(libs.aboutLibraries.core)
267-
implementation(libs.aboutLibraries.compose.core)
268-
implementation(libs.aboutLibraries.compose.m3)
268+
implementation(libs.aboutLibraries.ui)
269269
implementation(libs.compose.qr.code)
270270
implementation(libs.audio.amplituda)
271271

β€Žapp/src/main/kotlin/com/wire/android/ui/home/settings/about/licenses/LicenseDialog.ktβ€Ž

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ import androidx.compose.runtime.Composable
2929
import androidx.compose.ui.Modifier
3030
import androidx.compose.ui.res.stringResource
3131
import com.mikepenz.aboutlibraries.entity.Library
32-
import com.mikepenz.aboutlibraries.ui.compose.util.strippedLicenseContent
32+
import com.mikepenz.aboutlibraries.ui.compose.HtmlText
33+
import com.mikepenz.aboutlibraries.ui.compose.util.htmlReadyLicenseContent
3334
import com.wire.android.ui.theme.wireColorScheme
3435
import com.wire.android.ui.theme.wireTypography
3536

@@ -56,8 +57,8 @@ fun WireLicenseDialog(
5657
Column(
5758
modifier = Modifier.verticalScroll(scrollState),
5859
) {
59-
Text(
60-
text = library.strippedLicenseContent,
60+
HtmlText(
61+
html = library.licenses.firstOrNull()?.htmlReadyLicenseContent.orEmpty(),
6162
color = MaterialTheme.wireColorScheme.onBackground,
6263
)
6364
}

β€Žapp/src/main/kotlin/com/wire/android/ui/home/settings/about/licenses/LicensesViewModel.ktβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class LicensesViewModel @Inject constructor(
4141

4242
init {
4343
viewModelScope.launch(Dispatchers.IO) {
44-
val libraryList = Libs.Builder().withContext(context).build().libraries.distinctBy { it.uniqueId }
44+
val libraryList = Libs.Builder().withContext(context).build().libraries
4545
state = state.copy(libraryList = libraryList)
4646
}
4747
}

β€Žapp/src/test/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerStateHolderTest.ktβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class MessageComposerStateHolderTest {
7474
@BeforeEach
7575
fun before() {
7676
MockKAnnotations.init(this, relaxUnitFun = true)
77-
every { focusRequester.requestFocus() } returns true
77+
every { focusRequester.requestFocus() } returns Unit
7878
every { focusRequester.captureFocus() } returns true
7979
messageComposerViewState = mutableStateOf(MessageComposerViewState())
8080
messageComposition = mutableStateOf(MessageComposition(TestConversation.ID))

β€Žapp/src/test/kotlin/com/wire/android/ui/home/messagecomposer/state/MessageCompositionInputStateHolderTest.ktβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ class MessageCompositionInputStateHolderTest {
246246

247247
init {
248248
MockKAnnotations.init(this, relaxUnitFun = true)
249-
every { focusRequester.requestFocus() } returns true
249+
every { focusRequester.requestFocus() } returns Unit
250250
every { focusRequester.captureFocus() } returns true
251251
every { softwareKeyboardController.show() } returns Unit
252252
}

β€Žgradle/libs.versions.tomlβ€Ž

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ detekt = "1.23.8"
1919
google-gms = "4.4.2"
2020
gms-location = "21.3.0"
2121
android-gradlePlugin = "8.10.1"
22-
desugaring = "2.1.5"
22+
desugaring = "2.1.3"
2323
firebaseBOM = "33.6.0"
2424
fragment = "1.5.6"
2525
resaca = "3.0.0"
@@ -87,7 +87,7 @@ lint-compose = "1.4.2"
8787
openIdAppAuth = "0.11.1"
8888

8989
# Other Tools
90-
aboutLibraries = "12.2.4"
90+
aboutLibraries = "11.1.4"
9191
leakCanary = "2.14"
9292
ksp = "2.1.0-1.0.28"
9393

@@ -265,8 +265,7 @@ audio-amplituda = { module = "com.github.lincollincol:amplituda", version.ref =
265265

266266
# Dev tools
267267
aboutLibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "aboutLibraries" }
268-
aboutLibraries-compose-core = { module = "com.mikepenz:aboutlibraries-compose-core", version.ref = "aboutLibraries" }
269-
aboutLibraries-compose-m3 = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutLibraries" }
268+
aboutLibraries-ui = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "aboutLibraries" }
270269
leakCanary = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakCanary" }
271270

272271
# Testing

β€Žsettings.gradle.ktsβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see http://www.gnu.org/licenses/.
1717
*/
18-
rootProject.name = "wire-android"
1918
pluginManagement {
2019
includeBuild("build-logic")
2120
repositories {

0 commit comments

Comments
Β (0)