Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Commit

Permalink
Revert implementation of AboutLibraries.
Browse files Browse the repository at this point in the history
This will be done in a separate PR: #13767
  • Loading branch information
gilbsgilbs committed Aug 12, 2020
1 parent 5e1ebaf commit 8d948bf
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 22 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'jacoco'
apply plugin: 'androidx.navigation.safeargs.kotlin'
apply plugin: 'com.mikepenz.aboutlibraries.plugin'
apply plugin: 'com.google.android.gms.oss-licenses-plugin'


import com.android.build.OutputFile
Expand Down Expand Up @@ -348,7 +348,7 @@ dependencies {
implementation Deps.androidx_coordinatorlayout

implementation Deps.sentry
implementation Deps.aboutlibraries
implementation Deps.osslicenses_library

implementation Deps.mozilla_concept_engine
implementation Deps.mozilla_concept_menu
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import android.view.ViewGroup
import androidx.core.content.pm.PackageInfoCompat
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.DividerItemDecoration
import com.mikepenz.aboutlibraries.LibsBuilder
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
import kotlinx.android.synthetic.main.fragment_about.*
import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.BuildConfig
Expand Down Expand Up @@ -119,7 +119,7 @@ class AboutFragment : Fragment(), AboutPageListener {
private fun populateAboutList(): List<AboutPageItem> {
val context = requireContext()

return listOfNotNull(
return listOf(
AboutPageItem(
AboutItem.ExternalLink(
WHATS_NEW,
Expand Down Expand Up @@ -168,11 +168,13 @@ class AboutFragment : Fragment(), AboutPageListener {
}

private fun openLibrariesPage() {
val ctx = context
if (ctx != null) {
val title = getString(R.string.open_source_licenses_title, appName)
LibsBuilder().withAboutAppName(title).start(ctx)
}
startActivity(Intent(context, OssLicensesMenuActivity::class.java))
OssLicensesMenuActivity.setActivityTitle(
getString(
R.string.open_source_licenses_title,
appName
)
)
}

override fun onAboutItemClicked(item: AboutItem) {
Expand Down
11 changes: 1 addition & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,13 @@ buildscript {
classpath Deps.tools_kotlingradle
classpath Deps.androidx_safeargs
classpath Deps.allopen
classpath Deps.aboutlibraries_plugin
classpath Deps.osslicenses_plugin

classpath "org.mozilla.components:tooling-glean-gradle:${Versions.mozilla_android_components}"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}

// AboutLibraries depends on Android gradle plugin 4.0+, but we can't update it for now
// It should be safe to remove this block once android gradle plugin is updated
// See https://github.com/mozilla-mobile/fenix/issues/13262
configurations.classpath {
resolutionStrategy {
force Deps.tools_androidgradle
}
}
}

plugins {
Expand Down
7 changes: 4 additions & 3 deletions buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ object Versions {
const val sentry = "1.7.10"
const val leakcanary = "2.4"
const val leanplum = "5.4.0"
const val aboutlibraries = "8.3.0"
const val osslicenses_plugin = "0.9.5"
const val osslicenses_library = "17.0.0"
const val detekt = "1.9.1"

const val androidx_appcompat = "1.2.0-rc01"
Expand Down Expand Up @@ -57,8 +58,8 @@ object Deps {
const val kotlin_coroutines_android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}"

const val allopen = "org.jetbrains.kotlin:kotlin-allopen:${Versions.kotlin}"
const val aboutlibraries = "com.mikepenz:aboutlibraries:${Versions.aboutlibraries}"
const val aboutlibraries_plugin = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${Versions.aboutlibraries}"
const val osslicenses_plugin = "com.google.android.gms:oss-licenses-plugin:${Versions.osslicenses_plugin}"
const val osslicenses_library = "com.google.android.gms:play-services-oss-licenses:${Versions.osslicenses_library}"

const val mozilla_concept_engine = "org.mozilla.components:concept-engine:${Versions.mozilla_android_components}"
const val mozilla_concept_menu = "org.mozilla.components:concept-menu:${Versions.mozilla_android_components}"
Expand Down

0 comments on commit 8d948bf

Please sign in to comment.