Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KT-64377 use Java Test Suites for Gradle integration tests #3427

Merged
merged 40 commits into from
Feb 7, 2024
Merged

KT-64377 use Java Test Suites for Gradle integration tests #3427

merged 40 commits into from
Feb 7, 2024

Commits on Dec 19, 2023

  1. KT-64377 - remove gradle wrapper files for integration test projects (#… 

    …3418)

* remove Gradle wrapper files for integration test projects
* .gitignore Gradle wrapper files
    @adam-enko
    adam-enko authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    c31dd23 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Merge branch 'master' into KT-64377/update-integration-test-build-config

    @adam-enko
    adam-enko committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    61889af View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. Merge remote-tracking branch 'origin/master' into KT-64377/update-int… 

    …egration-test-build-config
    @adam-enko
    adam-enko committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    74a1b20 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. refactor integration test properties to use DokkaBuildProperties util… 

    …ity (#3420)

rename 'tryK2' to 'useK2' for integration tests
    @adam-enko
    adam-enko authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    20e0984 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into KT-64377/update-integration-test-build-config 

    # Conflicts:
#	dokka-integration-tests/gradle/projects/it-wasm-basic/gradle.properties
    @adam-enko
    adam-enko committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    66287db View commit details
    Browse the repository at this point in the history

  3. disable explicit API mode in non-published integration-test utilities (… 

    …#3428)
    @adam-enko
    adam-enko authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    28f4d7a View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Merge remote-tracking branch 'origin/master' into KT-64377/update-int… 

    …egration-test-build-config
    @adam-enko
    adam-enko committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    7af0394 View commit details
    Browse the repository at this point in the history

  2. Restructure Gradle Integration tests to use Java Test Suites 

    - create a test suite for each project under test (helps with Gradle caching, task avoidance)
- update CI/CD tasks to run specific test-suite tasks
- disable integration test tasks due to dependency on Maven Local publishing (this will be fixed in an upcoming PR)
    @adam-enko
    adam-enko committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    10fe4b5 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. revert GitHub smoke test Gradle task back to 'test'

    @adam-enko
    adam-enko committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    5f35a73 View commit details
    Browse the repository at this point in the history

  2. auto-discover and set ANDROID_SDK, and also search for local.properti… 

    …es files
    @adam-enko
    adam-enko committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    0babb2c View commit details
    Browse the repository at this point in the history

  3. add TODO link for integration tests - doNotTrackState()

    @adam-enko
    adam-enko committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    9c6c80e View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. Merge branch 'master' into KT-64377/java-test-suites 

    # Conflicts:
#	build-logic/src/main/kotlin/dokkabuild/DokkaBuildProperties.kt
#	dokka-integration-tests/gradle/README.md
#	dokka-integration-tests/gradle/build.gradle.kts
#	dokka-integration-tests/utilities/src/main/kotlin/org/jetbrains/dokka/it/AbstractIntegrationTest.kt
    @adam-enko
    adam-enko committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    b1c95de View commit details
    Browse the repository at this point in the history

  2. tidy up after merge

    @adam-enko
    adam-enko committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    28a1c74 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into KT-64377/java-test-… 

    …suites
    @adam-enko
    adam-enko committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    8a24b4d View commit details
    Browse the repository at this point in the history

  4. merge cleanup

    @adam-enko
    adam-enko committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    57b93cf View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. change plugin test-suite-base -> jvm-test-suite

    @adam-enko
    adam-enko committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    a974d9b View commit details
    Browse the repository at this point in the history

  2. move registerTestProjectSuite() to top-level function

    @adam-enko
    adam-enko committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    852fc7b View commit details
    Browse the repository at this point in the history

  3. move gradle-specific test utils to gradle integration test

    @adam-enko
    adam-enko committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    ba0c484 View commit details
    Browse the repository at this point in the history

  4. move unused systemVariableProviders.kt back

    @adam-enko
    adam-enko committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    6d5ab63 View commit details
    Browse the repository at this point in the history

  5. move multimodule-inter-module-links to test-suite

    @adam-enko
    adam-enko committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    14364ea View commit details
    Browse the repository at this point in the history

  6. register DOKKA_TEST_OUTPUT_PATH as a test task input, and the dir as … 

    …an output
    @adam-enko
    adam-enko committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    84255e2 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into KT-64377/java-test-suites

    @adam-enko
    adam-enko committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    37581f2 View commit details
    Browse the repository at this point in the history

  8. rm old import

    @adam-enko
    adam-enko committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    f6d1cca View commit details
    Browse the repository at this point in the history

  9. make testOutputPath optional

    @adam-enko
    adam-enko committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    9fe882b View commit details
    Browse the repository at this point in the history

  10. re-add integrationTest lifecycle task

    @adam-enko
    adam-enko committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    59594dd View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. fix it-multimodule-inter-module-links dir, add property name to tem… 

    …plateProjectDir for better error messages
    @adam-enko
    adam-enko committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    d249e64 View commit details
    Browse the repository at this point in the history

  2. comment to explain test-suites are independent

    @adam-enko
    adam-enko committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    ed0365f View commit details
    Browse the repository at this point in the history

  3. add property names to coroutines/serialization project dirs

    @adam-enko
    adam-enko committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    50a6ef4 View commit details
    Browse the repository at this point in the history

  4. use jvm11 for kotlinx.serialization

    @adam-enko
    adam-enko committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    99fc753 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Merge branch 'master' into KT-64377/java-test-suites

    @adam-enko
    adam-enko committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    47b3dc8 View commit details
    Browse the repository at this point in the history

  2. revert MaxMetaspaceSize in Coroutines test, and add comment to explain

    @adam-enko
    adam-enko committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    cd554b0 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. environment workaround for gradle/gradle#11534

    @adam-enko
    adam-enko committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    668c661 View commit details
    Browse the repository at this point in the history

  2. update CI build properties

    @adam-enko
    adam-enko committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    939d577 View commit details
    Browse the repository at this point in the history

  3. remove allWarningsAsErrors = false

    @adam-enko
    adam-enko committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    42cd06c View commit details
    Browse the repository at this point in the history

  4. remove 'check' task dependency

    @adam-enko
    adam-enko committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    df52ca1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into KT-64377/java-test-suites

    @adam-enko
    adam-enko committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    6eff18d View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Merge remote-tracking branch 'origin/master' into KT-64377/java-test-… 

    …suites

# Conflicts:
#	dokka-integration-tests/gradle/build.gradle.kts
    @adam-enko
    adam-enko committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    9ec8514 View commit details
    Browse the repository at this point in the history

  2. fix git-checkout task dependencies after merge, so they are more spec… 

    …ific to the external projects
    @adam-enko
    adam-enko committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    37a38fb View commit details
    Browse the repository at this point in the history

  3. fix logging of uri for git-checkout task

    @adam-enko
    adam-enko committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    b1c9a41 View commit details
    Browse the repository at this point in the history

  4. add invariantSeparatorsPath to androidSdkDir, so it's stable across m… 

    …achines (helps with remote Build Cache)
    @adam-enko
    adam-enko committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    f09111e View commit details
    Browse the repository at this point in the history