Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9884365
Copy top level files from integration
igordmn Jan 30, 2026
2b4e1e5
Copy workflow files from integration
igordmn Jan 30, 2026
3795d06
Copy buildSrc dependencies from integration
igordmn Jan 30, 2026
a0cf301
Copy build.gradle for maintained projects from integration
igordmn Jan 30, 2026
c753699
Replace gradle wrapper to regular public distribution
MatkovIvan Oct 1, 2025
66881c3
Do not require offline structure from repo-tool checkout
MatkovIvan Oct 1, 2025
cd9a2f1
Remove shouldIncludeInJetBrainsFork
igordmn Jan 30, 2026
bd5f717
settings.gradle. Restore projects from jb-main
igordmn Jan 30, 2026
8e47394
settings.gradle. Add stubs for referenced projects in androidMain
igordmn Jan 29, 2026
5e096cd
settings.gradle. Don't parse the defined projects
igordmn Jan 30, 2026
14051d6
Restore some build.gradle to jb-main state. commonMain
igordmn Jan 19, 2026
46acccd
Restore some build.gradle to jb-main state. commonTest
igordmn Jan 30, 2026
63aac0c
Restore some build.gradle to jb-main state. Fork source sets
igordmn Jan 30, 2026
ce6e0a5
Restore some build.gradle to jb-main state. Remove ui/foundation vers…
igordmn Jan 30, 2026
3998108
Restore some build.gradle to jb-main state. Compile args
igordmn Jan 30, 2026
dfa2eae
ui-util. Add Compose Runtime dependency
igordmn Jan 21, 2026
8a8476c
Set androidx.studio.type=jetbrains-fork
igordmn Jan 19, 2026
1fe98b6
Fix fork-only sourceSets
igordmn Jan 30, 2026
aa4befe
Restore jvmMain, jbMain, darwinMain for compatibility with new buildSrc
igordmn Jan 30, 2026
109c994
ui. move libs.jspecify to androidMain
igordmn Jan 30, 2026
64e1695
Restore demo-swiftui
igordmn Jan 26, 2026
ba32a82
Restore necessary workflow state from jb-main
igordmn Jan 26, 2026
7e89548
Restore vcs.xml and remove it from .gitignore
igordmn Jan 26, 2026
a7f87a8
JetBrainsFork mode. Various fixes
igordmn Jan 16, 2026
4b707e2
JetBrainsFork mode. Disable Android compilation during IDEA sync
igordmn Jan 21, 2026
9bfe729
JetBrainsFork mode. Configure tests
igordmn Jan 21, 2026
23ca5c6
Downgrade Kotlin to 2.2.20, set org.gradle.configuration-cache=false
igordmn Jan 26, 2026
d772db8
Disable BrowserHistoryTest on Firefox
igordmn Jan 22, 2026
806e3d9
Use the xcode lock in every Xcode call task
igordmn Jan 26, 2026
b74b1e5
Fix buildDir for iOS instrumented tests
igordmn Dec 16, 2025
94e17d1
Dump API
igordmn Jan 21, 2026
06f7c75
Fix :navigation:navigation-testing:compileKotlinDesktop in TestNaviga…
igordmn Jan 30, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
18 changes: 12 additions & 6 deletions .github/workflows/compose-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ on:
branches:
- jb-main

env:
# TODO: https://youtrack.jetbrains.com/issue/CMP-9497/Investgate-CfW-tests-flakiness-with-enabled-gradle-configuration-cache-on-CI
# Web Tests require running additional processes: karma in node, browser;
# To reduce the memory pressure, we change some defaults:
GRADLE_WEB_TESTS_FLAGS: >-
--no-daemon --stacktrace --no-parallel --no-configuration-cache
-Dorg.gradle.jvmargs="-Xmx8g -XX:+UseParallelGC"
-Porg.gradle.workers.max=1

jobs:
compose-desktop-tests:
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -211,8 +220,7 @@ jobs:
# Compile tests as a separate step to reduce memory usage and potential OOM during running tests.
- name: Compile ${{ matrix.task }} Tests
run: |
./gradlew compileTestKotlin${{ matrix.task }} \
--no-daemon --stacktrace
./gradlew compileTestKotlin${{ matrix.task }} ${{ env.GRADLE_WEB_TESTS_FLAGS }}

- name: Setup Google Chrome
uses: browser-actions/setup-chrome@v2
Expand Down Expand Up @@ -260,8 +268,7 @@ jobs:
# Compile tests as a separate step to reduce memory usage and potential OOM during running tests.
- name: Compile ${{ matrix.task }} Tests
run: |
./gradlew compileTestKotlin${{ matrix.task }} \
--no-daemon --stacktrace
./gradlew compileTestKotlin${{ matrix.task }} ${{ env.GRADLE_WEB_TESTS_FLAGS }}

- name: Setup Missing Packages
run: |
Expand All @@ -280,8 +287,7 @@ jobs:

- name: Run Web Firefox Tests
run: |
./gradlew :mpp:testWeb${{ matrix.task }} \
--no-daemon --stacktrace --no-parallel \
./gradlew :mpp:testWeb${{ matrix.task }} ${{ env.GRADLE_WEB_TESTS_FLAGS }} \
-Pjetbrains.androidx.web.tests.enableFirefox=true \
-Pjetbrains.androidx.web.tests.enableChrome=false

Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
!.idea/copyright/AndroidCopyright.xml
!.idea/copyright/profiles_settings.xml
!.idea/inspectionProfiles/Project_Default.xml
!.idea/ktfmt.xml
!.idea/icon.svg
!.idea/vcs.xml
.project
.settings/
project.properties
Expand Down
11 changes: 6 additions & 5 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 63 additions & 0 deletions .idea/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
94 changes: 78 additions & 16 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/ktfmt.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions .jbWebExistsMarker

This file was deleted.

4 changes: 2 additions & 2 deletions .run/desktop/test.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</option>
<option name="taskNames">
<list>
<option value="desktopTest -Pandroidx.ignoreTestFailures" />
<option value="desktopTest" />
</list>
</option>
<option name="vmOptions" />
Expand All @@ -21,4 +21,4 @@
<RunAsTest>true</RunAsTest>
<method v="2" />
</configuration>
</component>
</component>
16 changes: 16 additions & 0 deletions .run/mpp/demo/js-Demo.run.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
<!--
Copyright 2026 The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<component name="ProjectRunConfigurationManager">
<configuration default="false" name="js Demo" type="GradleRunConfiguration" factoryName="Gradle" folderName="mpp/demo">
<ExternalSystemSettings>
Expand Down
Loading