buildSrc restoration in integration #2609

igordmn · 2025-12-01T12:51:06Z

Release Notes

N/A

MatkovIvan · 2025-12-01T13:33:27Z

settings.gradle

 includeProject(":navigation:navigation-runtime-ktx", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE, BuildType.KMP])
-includeProject(":navigation:navigation-safe-args-generator", [BuildType.MAIN, BuildType.FLAN])
-includeProject(":navigation:navigation-safe-args-gradle-plugin", [BuildType.MAIN, BuildType.FLAN])
+//includeProject(":navigation:navigation-safe-args-generator", [BuildType.MAIN, BuildType.FLAN])


Modify shouldIncludeInJetBrainsFork instead

MatkovIvan · 2025-12-01T13:33:49Z

settings.gradle


 private String getRequestedProjectSubsetName() {
+    return "COMPOSE"
+    /* In JetBrains Fork only COMPOSE subset is supported.


no-repo changes are not supposed to be merged into the integration branch

gradle.properties

...gation-testing/src/jvmTest/kotlin/androidx/navigation/testing/TestSavedStateHandleFactory.kt

navigation/navigation-common/src/commonTest/kotlin/androidx/navigation/NavigatorProviderTest.kt

lifecycle/lifecycle-viewmodel-navigation3/build.gradle

MatkovIvan · 2025-12-01T13:37:14Z

compose/ui/ui-text/build.gradle

+
+afterEvaluate {
+    tasks.withType(Test) { t ->
+        t.jvmArgs += ["--add-opens=java.desktop/sun.font=ALL-UNNAMED"]


What's the context around it? Do we have some references/commits with explanation?

buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/ComposePlatforms.kt

igordmn · 2025-12-01T13:41:53Z

@MatkovIvan, it is not ready for review yet (this code is just to make it work, and will be refactored)

MatkovIvan · 2025-12-12T09:16:07Z

testutils/testutils-xctest/build.gradle

+        commonMain.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version
+        iosMain.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version
+        iosX64Main.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version
+        iosArm64Main.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version
+        iosSimArm64Main.languageSettings.languageVersion = KotlinTarget.DEFAULT.apiVersion.version


It's already handled on line 53

MatkovIvan · 2025-12-12T09:17:06Z

lifecycle/lifecycle-viewmodel-navigation3/build.gradle

+                def savedstateVersion = project.findProperty('artifactRedirection.version.androidx.savedstate')
+                api("androidx.savedstate:savedstate:$savedstateVersion")
+                api("androidx.savedstate:savedstate-compose:$savedstateVersion")
+                implementation(libs.kotlinStdlib)


Explicit kotlinStdlib shouldn't be necessary nowadays

MatkovIvan · 2025-12-12T09:19:30Z

compose/ui/ui-test/build.gradle

+            dependsOn(nativeTest)
+        }
+
+        uikitMain {


No more uikitMain in the project

MatkovIvan · 2025-12-12T09:19:35Z

compose/ui/ui-test/build.gradle

            dependsOn(nativeTest)
        }

+        macosMain {


MatkovIvan · 2025-12-12T09:21:36Z

compose/runtime/runtime-annotation/gradle.properties

There is no such file in jb-main at this location, please remove it.

Context: this module is not published from fork anymore and we don't have a stub for it

MatkovIvan · 2025-12-12T09:22:59Z

compose/material3/material3-adaptive-navigation-suite/build.gradle

            dependsOn(commonTest)
            dependencies {
                implementation(project(":kruth:kruth"))
+                implementation(libs.kotlinTest)


It's already in dependencies. See commonTest

MatkovIvan · 2025-12-12T09:23:20Z

compose/material3/adaptive/adaptive-layout/build.gradle

            dependsOn(commonTest)
            dependencies {
                implementation(project(":kruth:kruth"))
+                implementation(libs.kotlinTest)


It's already in dependencies. See commonTest

MatkovIvan · 2025-12-12T09:24:27Z

buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/ComposePlatforms.kt

    Desktop("Jvm"),
-    AndroidDebug("Android"),
-    AndroidRelease("Android"),
+    Android("Android"),


Why are we removing this Android split? Is it intentional?

MatkovIvan · 2025-12-12T09:31:18Z

lifecycle/lifecycle-viewmodel-navigation3/build.gradle

            }
        }

+        jvmMain {


Shouldn't androidMain depend on this too?

Because it sample_font.ttf changed in AOSP, and we would have to adapt test for it

@JvmSuppressWildcards isn't in the expect, and not in jb-main

``` > Task :lifecycle:lifecycle-runtime:compileTestKotlinWasmJs FAILED e: file:///D:/Work/2/compose-multiplatform-core/lifecycle/lifecycle-runtime/src/wasmJsTest/kotlin/androidx/lifecycle/runLifecycleTest.wasmJs.kt:24:5 Return type mismatch: expected 'JsPromiseInterfaceForTesting', actual 'Promise<JsAny?>'. e: file:///D:/Work/2/compose-multiplatform-core/lifecycle/lifecycle-runtime/src/webTest/kotlin/androidx/lifecycle/runLifecycleTest.web.kt:23:8 Conflicting overloads: actual fun runLifecycleTest(block: suspend CoroutineScope.() -> Unit): JsPromiseInterfaceForTesting ``` - runLifecycleTest.wasmJs.kt was added in `integration` - but isn't compilable - jb-main doesn't use this file

Only Android is supported by new AGP

To avoid combining multiple changes Plan: - merge to jb-main - sync dependencies with AOSP in jb-main(TODO create task)

MatkovIvan reviewed Dec 1, 2025

View reviewed changes

igordmn changed the base branch from integration to igor.demin/integration-c49f30 December 5, 2025 20:13

igordmn force-pushed the igor.demin/no-repo2 branch 2 times, most recently from df05ac0 to cd39c71 Compare December 11, 2025 21:25

igordmn changed the base branch from igor.demin/integration-c49f30 to integration-no-repo December 11, 2025 21:30

MatkovIvan reviewed Dec 12, 2025

View reviewed changes

lifecycle/lifecycle-viewmodel-navigation3/build.gradle Outdated

}

}

jvmMain {

Copy link

Member

MatkovIvan Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't androidMain depend on this too?

igordmn force-pushed the igor.demin/no-repo2 branch 7 times, most recently from 99b6df1 to 8764eec Compare December 16, 2025 17:05

igordmn added 8 commits December 17, 2025 20:41

no-repo. exclude projects

20346a0

no-repo. fix android compilation

5254cb6

Fix Version.isSnapshot()

c8e626c

Fix run configuration

eaf024b

Introduce sample_font_fork.ttf

74d6028

Because it sample_font.ttf changed in AOSP, and we would have to adapt test for it

Update binaryCompatibilityValidator

81e403e

Remove unused code

e7d27d2

Remove redundant dependencies

ad524db

igordmn force-pushed the igor.demin/no-repo2 branch from 8764eec to 1953f03 Compare December 17, 2025 21:23

igordmn added 6 commits December 17, 2025 22:34

API dump

9ebd9b5

Fix buildDir for iOS instrumented tests

c1da39d

Fix navigation-compose iOS compilation

919aa90

@JvmSuppressWildcards isn't in the expect, and not in jb-main

Restore watchos/tvos publication

6851bf8

Set Java compatibility to 11 for Android and Desktop

b351786

Fix Web

382d2eb

igordmn and others added 11 commits December 17, 2025 22:34

Fix Desktop

f8f6259

Fix lifecycle-viewmodel-navigation3

9e3a8e3

Restore fork gradle properties

8768cca

Replace AndroidDebug/AndroidRelease by Android

93be6e4

Only Android is supported by new AGP

Fix publishing tasks

4bf1ab5

Fix extensions

8166825

Fix publication WIP

8e5b954

Load compatibility-stub projects instead of original ones

66f4673

Update build scripts in stub projects

5b1b97c

Uncomment JetBrainsPublication for stub projects

c2ca1ba

igordmn force-pushed the igor.demin/no-repo2 branch from 1425c08 to 49cc6a5 Compare December 17, 2025 21:34

igordmn added 3 commits December 19, 2025 19:02

Update build scripts in stub projects

dedd0c5

Remove runtime-retain project

fec8b31

Remove :compose:runtime:runtime-annotation project

be0860e

igordmn force-pushed the igor.demin/no-repo2 branch 6 times, most recently from 77f2e61 to 7e5475a Compare December 19, 2025 23:49

igordmn added 4 commits December 20, 2025 00:57

Restore dependencies to jb-main state

3cf0710

To avoid combining multiple changes Plan: - merge to jb-main - sync dependencies with AOSP in jb-main(TODO create task)

Disable buildSrc tasks

75a418f

Fix Android redirection

6ef383d

Fix :compose:ui:ui-uikit error because of parallel execution

f767dc1

igordmn force-pushed the igor.demin/no-repo2 branch from 7e5475a to f767dc1 Compare December 19, 2025 23:57

buildSrc restoration in integration #2609

Are you sure you want to change the base?

buildSrc restoration in integration #2609

Conversation

igordmn commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Release Notes

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

igordmn commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MatkovIvan Dec 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

igordmn commented Dec 1, 2025 •

edited

Loading

igordmn commented Dec 1, 2025 •

edited

Loading

MatkovIvan Dec 12, 2025 •

edited

Loading