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.

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

#854 update projects to use new Kotlin Multiplatform Gradle plugin #855

Merged
merged 40 commits into from Aug 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
5dd6754
initial setup of buildSrc. Disable subprojects for now - they will be…
aSemy Jul 26, 2022
8ae24df
tidy up directories a bit (this probably breaks some stuff - can be r…
aSemy Jul 26, 2022
6ae0a45
rm leftover utils(?)
aSemy Jul 28, 2022
0d042f1
tidy up gitignore
aSemy Jul 28, 2022
58cc605
convert Android SDK detector to kts
aSemy Jul 28, 2022
28c6c08
initial subprojects setup
aSemy Jul 28, 2022
75926c9
migrate mockk-dsl (make two functions internal to try and match .api …
aSemy Jul 28, 2022
72b3564
migrate mockk-agent
aSemy Jul 28, 2022
4aa4c16
migrate android projects
aSemy Jul 28, 2022
b32d6bb
migrate mockk core!
aSemy Jul 28, 2022
a9b113e
fix android projects
aSemy Jul 28, 2022
5344d65
- Update Android Gradle config to Kotlin
aSemy Jul 30, 2022
3e84f30
tidy upp old build files, and api files
aSemy Jul 30, 2022
5dd6203
update api files
aSemy Jul 30, 2022
c769903
rm unused Gradle settings config
aSemy Jul 30, 2022
268c2d3
tidy up, remove commented out build config
aSemy Jul 30, 2022
0ff9d1d
Merge remote-tracking branch 'mockk/master' into fix/854-update-build…
aSemy Jul 30, 2022
31145fa
update api files
aSemy Jul 30, 2022
10d8e6c
update buildSrc kotlinVersion
aSemy Jul 30, 2022
1f0051c
revert versions change
aSemy Jul 30, 2022
b45f74f
fix mockk-android dependencies
aSemy Jul 30, 2022
c4b2386
rm commented out dependency
aSemy Jul 30, 2022
8382d28
- migrate publishing config to a buildSrc convention plugin
aSemy Jul 31, 2022
63fe814
Merge remote-tracking branch 'mockk/master' into fix/854-update-build…
aSemy Jul 31, 2022
63e7ed6
update POM names/descriptions
aSemy Jul 31, 2022
9702ffb
revert moved assets
aSemy Jul 31, 2022
d5c252b
bump gradle 7.5.1
aSemy Aug 8, 2022
134a347
use Gradle toolchains to set the java version for the project & for t…
aSemy Aug 8, 2022
6ff2842
reduce 'signing is enabled' log message
aSemy Aug 8, 2022
d9b8779
try fixing JUnit tests not running, migrate JUnit4 test to JUnit5, so…
aSemy Aug 8, 2022
6c1cb03
set distribution as temurin
aSemy Aug 8, 2022
4c9d719
set maven local repo to use localrepo property
aSemy Aug 8, 2022
d1d4518
bump toolchain versions to latest LTS version
aSemy Aug 9, 2022
fd65c4b
lower toolchain version, adjust how it's set in the GitHub Action
aSemy Aug 9, 2022
216ca93
set-up separate Java Toolchains for test/main tasks
aSemy Aug 9, 2022
bd4e048
fix android test dependencies
aSemy Aug 9, 2022
35e5836
disable failing sealed class tests
aSemy Aug 9, 2022
634814c
formatting
aSemy Aug 9, 2022
339f19e
disable failing sealed interface tests
aSemy Aug 9, 2022
6eab7ab
set buildSrc to use jdk11
aSemy Aug 12, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 15 additions & 9 deletions .github/workflows/gradle.yml
Expand Up @@ -22,7 +22,7 @@ jobs:
fail-fast: false # in case one JDK fails, we still want to see results from others
timeout-minutes: 30
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup Gradle Dependencies Cache
uses: actions/cache@v3
Expand All @@ -37,15 +37,20 @@ jobs:
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

- name: Set up JDK ${{ matrix.java-version }}
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: ${{ matrix.java-version }}
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Run tests with Gradle
uses: eskatos/gradle-command-action@v1
with:
arguments: test --stacktrace -Pkotlin.version=${{ matrix.kotlin-version }} -Pkotlin.ir.enabled=${{ matrix.kotlin-ir-enabled }}
arguments: |
test
--stacktrace
-Pkotlin.version=${{ matrix.kotlin-version }}
-Pkotlin.ir.enabled=${{ matrix.kotlin-ir-enabled }}
-PjavaToolchainTestVersion=${{ matrix.java-version }}

android-instrumented-tests:
runs-on: macos-latest
Expand All @@ -55,11 +60,12 @@ jobs:
fail-fast: false # in case one API-level fails, we still want to see results from others
timeout-minutes: 30
steps:
- uses: actions/setup-java@v2
- uses: actions/checkout@v3

- uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '11'
- uses: actions/checkout@v2
distribution: adopt
java-version: 11

- name: Setup Gradle Dependencies Cache
uses: actions/cache@v3
Expand Down
20 changes: 11 additions & 9 deletions .gitignore
@@ -1,16 +1,18 @@
.idea
.idea/
.cxx
out

out/
build/

.gradle/

*.iml
.gradle
build
hs_err_*
replay_*
agent/android/.externalNativeBuild/
matrix/results
local.properties
/mockk-js/node_modules
/cloud-badge/credentials.json
/cloud-badge/node_modules/
/cloud-badge/package-lock.json
.java-version
mockk-js/node_modules/
cloud-badge/credentials.json
cloud-badge/node_modules/
cloud-badge/package-lock.json
1 change: 0 additions & 1 deletion MAINTAINING.md
Expand Up @@ -28,4 +28,3 @@
- [ ] push to github
- [ ] create github release based on tag and describe changes there
- [ ] announce on reddit/kotlinlang/potentially at "announcement place" on mockk.io

92 changes: 0 additions & 92 deletions agent/android/build.gradle

This file was deleted.

31 changes: 0 additions & 31 deletions agent/android/dispatcher/build.gradle.kts

This file was deleted.

10 changes: 0 additions & 10 deletions agent/api/build.gradle.kts

This file was deleted.

14 changes: 0 additions & 14 deletions agent/common/build.gradle.kts

This file was deleted.

55 changes: 0 additions & 55 deletions agent/jvm/build.gradle

This file was deleted.

54 changes: 0 additions & 54 deletions build.gradle

This file was deleted.

30 changes: 30 additions & 0 deletions build.gradle.kts
@@ -0,0 +1,30 @@
import buildsrc.config.excludeGeneratedGradleDslAccessors

plugins {
base
org.jetbrains.kotlinx.`binary-compatibility-validator`
org.jetbrains.kotlinx.kover
idea

// note: plugin versions are set in ./buildSrc/build.gradle.kts
}

group = "io.mockk"

tasks.wrapper {
gradleVersion = "7.5.1"
distributionType = Wrapper.DistributionType.ALL
}

idea {
module {
isDownloadSources = true
isDownloadJavadoc = true

excludeGeneratedGradleDslAccessors(layout)
excludeDirs = excludeDirs + layout.files(
".idea",
"gradle/wrapper",
)
}
}