From e99be615ce7c2c2b5c3ee5e3f8941c41c1e7a944 Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Fri, 31 Jan 2020 00:37:29 +0100 Subject: Bump Gradle version, migrate to Kotlin DSL, refactor publishing --- integration-tests/build.gradle.kts | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 integration-tests/build.gradle.kts (limited to 'integration-tests/build.gradle.kts') diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts new file mode 100644 index 00000000..e69de29b -- cgit From a573641a70a626983c1d63965e377ea0be274f41 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Thu, 2 Jul 2020 14:18:51 +0200 Subject: Implement AndroidGradleIntegrationTest --- .github/workflows/gradle-build.pr.yml | 16 -- .github/workflows/gradle-integration-test.pr.yml | 13 ++ .github/workflows/gradle-test.pr.yml | 16 ++ .idea/jarRepositories.xml | 5 + .run/it-android-0_dokka.run.xml | 24 +++ .../src/main/kotlin/org/jetbrains/projectUtils.kt | 16 ++ integration-tests/build.gradle.kts | 30 ++++ integration-tests/gradle/build.gradle.kts | 19 ++- .../gradle/projects/it-android-0/build.gradle.kts | 19 +++ .../gradle/projects/it-android-0/gradle.properties | 2 + .../it-android-0/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + .../gradle/projects/it-android-0/gradlew | 183 +++++++++++++++++++++ .../gradle/projects/it-android-0/gradlew.bat | 100 +++++++++++ .../projects/it-android-0/settings.gradle.kts | 5 + .../it-android-0/src/main/AndroidManifest.xml | 1 + .../main/java/it/android/AndroidSpecificClass.kt | 16 ++ .../gradle/projects/template.root.gradle.kts | 4 + .../gradle/projects/template.settings.gradle.kts | 11 ++ .../it/gradle/Android0GradleIntegrationTest.kt | 69 ++++++++ .../dokka/it/gradle/BasicGradleIntegrationTest.kt | 71 ++++++++ .../gradle/Multiplatform0GradleIntegrationTest.kt | 43 +++++ ...AbstractDefaultVersionsGradleIntegrationTest.kt | 84 ---------- .../it/gradle/AbstractGradleIntegrationTest.kt | 30 ++-- .../org/jetbrains/dokka/it/gradle/BuildVersions.kt | 38 ++++- .../kotlin/org/jetbrains/dokka/it/gradle/utils.kt | 29 ---- .../dokka/it/gradle/BasicGradleIntegrationTest.kt | 62 ------- .../gradle/Multiplatform0GradleIntegrationTest.kt | 41 ----- settings.gradle.kts | 1 + 29 files changed, 702 insertions(+), 251 deletions(-) delete mode 100644 .github/workflows/gradle-build.pr.yml create mode 100644 .github/workflows/gradle-integration-test.pr.yml create mode 100644 .github/workflows/gradle-test.pr.yml create mode 100644 .run/it-android-0_dokka.run.xml create mode 100644 buildSrc/src/main/kotlin/org/jetbrains/projectUtils.kt create mode 100644 integration-tests/gradle/projects/it-android-0/build.gradle.kts create mode 100644 integration-tests/gradle/projects/it-android-0/gradle.properties create mode 100644 integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.jar create mode 100644 integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties create mode 100755 integration-tests/gradle/projects/it-android-0/gradlew create mode 100644 integration-tests/gradle/projects/it-android-0/gradlew.bat create mode 100644 integration-tests/gradle/projects/it-android-0/settings.gradle.kts create mode 100644 integration-tests/gradle/projects/it-android-0/src/main/AndroidManifest.xml create mode 100644 integration-tests/gradle/projects/it-android-0/src/main/java/it/android/AndroidSpecificClass.kt create mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt create mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt create mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractDefaultVersionsGradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/utils.kt delete mode 100644 integration-tests/gradle/src/test/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/test/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt (limited to 'integration-tests/build.gradle.kts') diff --git a/.github/workflows/gradle-build.pr.yml b/.github/workflows/gradle-build.pr.yml deleted file mode 100644 index 2723ecf4..00000000 --- a/.github/workflows/gradle-build.pr.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: CI - -on: pull_request - -jobs: - build: - strategy: - matrix: - os: [ubuntu-latest, windows-latest] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 11 - - run: ./gradlew clean build --stacktrace \ No newline at end of file diff --git a/.github/workflows/gradle-integration-test.pr.yml b/.github/workflows/gradle-integration-test.pr.yml new file mode 100644 index 00000000..bfc1b9d3 --- /dev/null +++ b/.github/workflows/gradle-integration-test.pr.yml @@ -0,0 +1,13 @@ +name: CI (Integration Test) + +on: pull_request + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - run: ./gradlew clean integrationTest -s diff --git a/.github/workflows/gradle-test.pr.yml b/.github/workflows/gradle-test.pr.yml new file mode 100644 index 00000000..2838d975 --- /dev/null +++ b/.github/workflows/gradle-test.pr.yml @@ -0,0 +1,16 @@ +name: CI (Test) + +on: pull_request + +jobs: + build: + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - run: ./gradlew clean test --stacktrace diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index e0b545b3..0c589859 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -96,5 +96,10 @@