Skip to content

Commit

Permalink
Remove play core in favor or play review. Update other dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
sictiru committed Jun 18, 2024
1 parent 192e94d commit fbea670
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.newsblur.benchmark

import androidx.benchmark.macro.ExperimentalBaselineProfilesApi
import android.os.Build
import androidx.annotation.RequiresApi
import androidx.benchmark.macro.junit4.BaselineProfileRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Rule
Expand All @@ -10,7 +11,7 @@ import org.junit.runner.RunWith
/**
* Runs in its own process
*/
@OptIn(ExperimentalBaselineProfilesApi::class)
@RequiresApi(Build.VERSION_CODES.P)
@RunWith(AndroidJUnit4::class)
class BaselineProfileGenerator {

Expand All @@ -19,7 +20,7 @@ class BaselineProfileGenerator {

@Test
fun generateSimpleStartupProfile() {
rule.collectBaselineProfile(packageName = "com.newsblur") {
rule.collect(packageName = "com.newsblur") {
pressHome()
startActivityAndWait()
}
Expand All @@ -28,7 +29,7 @@ class BaselineProfileGenerator {
@Test
fun generateUserJourneyProfile() {
var needsLogin = true
rule.collectBaselineProfile(packageName = "com.newsblur") {
rule.collect(packageName = "com.newsblur") {
pressHome()
startActivityAndWait()

Expand Down
2 changes: 1 addition & 1 deletion clients/android/NewsBlur/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ dependencies {
implementation(Dependencies.okHttp)
implementation(Dependencies.gson)
implementation(Dependencies.billing)
implementation(Dependencies.playCore)
implementation(Dependencies.playReview)
implementation(Dependencies.material)
implementation(Dependencies.preference)
implementation(Dependencies.browser)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
import android.view.Menu;
import android.view.MenuItem;

import com.google.android.gms.tasks.Task;
import com.google.android.play.core.review.ReviewInfo;
import com.google.android.play.core.review.ReviewManager;
import com.google.android.play.core.review.ReviewManagerFactory;
import com.google.android.play.core.tasks.Task;
import com.newsblur.R;
import com.newsblur.di.IconLoader;
import com.newsblur.domain.Feed;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ object Dependencies {
const val okHttp = "com.squareup.okhttp3:okhttp:${Version.okHttp}"
const val gson = "com.google.code.gson:gson:${Version.gson}"
const val billing = "com.android.billingclient:billing:${Version.billing}"
const val playCore = "com.google.android.play:core:${Version.playCore}"
const val material = "com.google.android.material:material:${Version.material}"
const val preference = "androidx.preference:preference-ktx:${Version.preference}"
const val browser = "androidx.browser:browser:${Version.browser}"
Expand All @@ -16,6 +15,7 @@ object Dependencies {
const val hiltAndroid = "com.google.dagger:hilt-android:${Version.hilt}"
const val hiltCompiler = "com.google.dagger:hilt-compiler:${Version.hilt}"
const val profileInstaller = "androidx.profileinstaller:profileinstaller:${Version.profileInstaller}"
const val playReview = "com.google.android.play:review:${Version.playReview}"

// test
const val junit = "junit:junit:${Version.junit}"
Expand Down
18 changes: 9 additions & 9 deletions clients/android/NewsBlur/buildSrc/src/main/java/Version.kt
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
object Version {

const val android = "8.3.1"
const val android = "8.5.0"

const val kotlin = "1.9.23"

const val fragment = "1.6.2"
const val fragment = "1.8.0"
const val recyclerView = "1.3.2"
const val swipeRefreshLayout = "1.1.0"

const val okHttp = "4.12.0"
const val gson = "2.10.1"
const val gson = "2.11.0"
const val billing = "6.2.0"
const val playCore = "1.10.3"
const val material = "1.11.0"
const val playReview = "2.0.1"
const val material = "1.12.0"

const val preference = "1.2.1"
const val browser = "1.8.0"
const val lifecycle = "2.7.0"
const val lifecycle = "2.8.2"
const val splashScreen = "1.0.1"

const val hilt = "2.51"
const val hilt = "2.51.1"
const val profileInstaller = "1.3.1"

const val junit = "4.13.2"
const val mockk = "1.13.10"
const val mockk = "1.13.11"

const val junitExt = "1.1.5"
const val espresso = "3.5.1"

const val uiAutomator = "2.3.0"
const val benchmarkMacroJunit4 = "1.2.3"
const val benchmarkMacroJunit4 = "1.2.4"

const val benManesVersions = "0.51.0"
}

0 comments on commit fbea670

Please sign in to comment.