msb-public
/
nowinandroid
mirror of https://github.com/android/nowinandroid.git
1
0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse Source
pull/2064/head
lihenggui 1 year ago
parent 6ce4db17fb d35dc6cba8
commit 3f7e1620a1
13 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File

1
.github/workflows/NightlyBaselineProfiles.yaml vendored
Unescape View File

@ -7,6 +7,7 @@ on:
jobs:
baseline_profiles:
name: "Generate Baseline Profiles"
if: github.repository == 'android/nowinandroid'
runs-on: ubuntu-latest
permissions:

1
.github/workflows/Release.yml vendored
Unescape View File

@ -7,6 +7,7 @@ on:
jobs:
build:
if: github.repository == 'android/nowinandroid'
runs-on: ubuntu-latest
timeout-minutes: 120

4
app/src/androidMain/res/values/themes.xml
Unescape View File

@ -21,7 +21,9 @@
<style name="NightAdjusted.Theme.Nia" parent="android:Theme.Material.Light.NoActionBar" />
<!-- The final theme we use -->
<style name="Theme.Nia" parent="NightAdjusted.Theme.Nia" />
<style name="Theme.Nia" parent="NightAdjusted.Theme.Nia">
<item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
</style>
<style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
<item name="android:windowLightStatusBar" tools:targetApi="23">true</item>

4
build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt
Unescape View File

@ -19,12 +19,14 @@ import com.android.build.api.variant.ApplicationAndroidComponentsExtension
import com.google.samples.apps.nowinandroid.configureJacoco
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.getByType
class AndroidApplicationJacocoConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
pluginManager.apply("jacoco")
apply(plugin = "jacoco")
val androidExtension = extensions.getByType<ApplicationExtension>()
androidExtension.buildTypes.configureEach {

5
build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt
Unescape View File

@ -15,17 +15,18 @@
*/
import com.android.build.api.dsl.LibraryExtension
import com.android.build.api.variant.ApplicationAndroidComponentsExtension
import com.android.build.api.variant.LibraryAndroidComponentsExtension
import com.google.samples.apps.nowinandroid.configureJacoco
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.getByType
class AndroidLibraryJacocoConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
pluginManager.apply("jacoco")
apply(plugin = "jacoco")
val androidExtension = extensions.getByType<LibraryExtension>()
androidExtension.buildTypes.configureEach {

3
build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
Unescape View File

@ -19,6 +19,7 @@ import com.android.build.api.dsl.LibraryExtension
import com.android.build.api.dsl.Lint
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
class AndroidLintConventionPlugin : Plugin<Project> {
@ -32,7 +33,7 @@ class AndroidLintConventionPlugin : Plugin<Project> {
configure<LibraryExtension> { lint(Lint::configure) }
else -> {
pluginManager.apply("com.android.lint")
apply(plugin = "com.android.lint")
configure<Lint>(Lint::configure)
}
}

8
build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
Unescape View File

@ -19,15 +19,14 @@ import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
import com.google.samples.apps.nowinandroid.configureKotlinAndroid
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
class AndroidTestConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
with(pluginManager) {
apply("com.android.test")
apply("org.jetbrains.kotlin.android")
}
apply(plugin = "com.android.test")
apply(plugin = "org.jetbrains.kotlin.android")
extensions.configure<TestExtension> {
configureKotlinAndroid(this)
@ -36,5 +35,4 @@ class AndroidTestConventionPlugin : Plugin<Project> {
}
}
}
}

8
build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt
Unescape View File

@ -18,15 +18,15 @@ import com.google.samples.apps.nowinandroid.configureKotlinJvm
import com.google.samples.apps.nowinandroid.libs
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.dependencies
class JvmLibraryConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
with(pluginManager) {
apply("org.jetbrains.kotlin.jvm")
apply("nowinandroid.android.lint")
}
apply(plugin = "org.jetbrains.kotlin.jvm")
apply(plugin = "nowinandroid.android.lint")
configureKotlinJvm()
dependencies {
"testImplementation"(libs.findLibrary("kotlin.test").get())

2
build.gradle.kts
Unescape View File

@ -25,7 +25,7 @@ buildscript {
}
mavenCentral()
// Android Build Server
// This is used only for internal Google builds.
maven { url = uri("../nowinandroid-prebuilts/m2repository") }
}
dependencies {

1
core/data/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt
Unescape View File

@ -95,6 +95,7 @@ class OfflineFirstNewsRepositoryTest {
@Test
fun offlineFirstNewsRepository_news_resources_stream_is_backed_by_news_resource_dao() =
testScope.runTest {
subject.syncWith(synchronizer)
assertEquals(
newsResourceDao.getNewsResources()
.first()

2
core/data/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt
Unescape View File

@ -73,6 +73,8 @@ class OfflineFirstTopicsRepositoryTest {
@Test
fun offlineFirstTopicsRepository_topics_stream_is_backed_by_topics_dao() =
testScope.runTest {
subject.syncWith(synchronizer)
assertEquals(
topicDao.getTopicEntities()
.first()

13
gradle/libs.versions.toml
Unescape View File

@ -1,12 +1,13 @@
[versions]
accompanist = "0.37.0"
androidDesugarJdkLibs = "2.1.3"
androidDesugarJdkLibs = "2.1.4"
# AGP and tools should be updated together
androidGradlePlugin = "8.7.3"
androidTools = "31.7.3"
androidxActivity = "1.9.3"
androidxBrowser = "1.8.0"
androidxComposeBom = "2024.12.01"
androidxComposeFoundation = "1.8.0-alpha07"
androidxComposeRuntimeTracing = "1.7.6"
androidxCore = "1.15.0"
androidxCoreSplashscreen = "1.0.1"
@ -30,15 +31,15 @@ coil = "3.0.3"
dependencyGuard = "0.5.0"
jacoco = "0.8.7"
kotlin = "2.1.0"
kotlinxCoroutines = "1.9.0"
kotlinxCoroutines = "1.10.1"
kotlinxDatetime = "0.6.1"
kotlinxSerializationJson = "1.7.3"
kotlinxSerializationJson = "1.8.0"
ksp = "2.1.0-1.0.29"
logback = "1.5.12"
logback = "1.5.15"
material3adaptive = "1.0.1"
moduleGraph = "2.7.1"
robolectric = "4.14"
roborazzi = "1.36.0"
roborazzi = "1.39.0"
secrets = "2.0.1"
truth = "1.4.4"
turbine = "1.2.0"
@ -46,7 +47,7 @@ androidx-constraintlayout = "2.2.0"
androidx-espresso-core = "3.6.1"
androidx-material = "1.12.0"
androidx-test-junit = "1.2.1"
compose-ui-tooling = "1.7.5"
compose-ui-tooling = "1.7.6"
compose-plugin = "1.7.1"
sqldelight = "2.0.2"
kotlinInject = '0.7.2'

2
gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

Write Preview
Loading…
Cancel
Save