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

Backport much of master to 1.9.x; KotlinCompile type, osdetector, lazy buildDir #678

Merged
merged 6 commits into from
Feb 10, 2023
Merged

Backport much of master to 1.9.x; KotlinCompile type, osdetector, lazy buildDir #678

merged 6 commits into from
Feb 10, 2023

Commits on Feb 10, 2023

  1. Avoid OOM during tests by forking 

    Generally on my laptop I cannot run many of the tests before they fail
with out-of-memory. With this, I can run all the tests successfully.

There does not seem to be a way to request forking directly. Instead,
the docs warn about passing an environment because it will cause
forking. In our case, that seems to be exactly what we want.

I believe this is a workaround and only benefitting indirectly, but it
works and is easy and I'll take what I can get.
    @ejona86
    ejona86 committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    e765c18 View commit details
    Browse the repository at this point in the history

  2. Use KotlinCompile type directly (google#657) 

    * Use KotlinCompile type directly

* Add Kotlin 1.7.20, Gradle 7.6 versions to tests

* Fix codenarc issues

* Do not run all gradleVersion * kotlinVersion combinations

* Bump kotlin and agp versions
    @rougsig @ejona86
    rougsig authored and ejona86 committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    4cf2e62 View commit details
    Browse the repository at this point in the history

  3. build.gradle: Remove old/unnecessary repositories 

    kotlin.bintray.com is dead and has an invalid certificate.
repo.gradle.org was for gradle-kotlin-dsl which we're getting through
plugins.gradle.org.
    @ejona86
    ejona86 committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    64da3d6 View commit details
    Browse the repository at this point in the history

  4. Upgrade osdetector-gradle-plugin to 1.7.2

    @ejona86
    ejona86 committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    08b6991 View commit details
    Browse the repository at this point in the history

  5. Delay buildDir evaluation until needed 

    This causes the plugin to use the correct configuration when users
use a non-default buildDir.

Note that for IDEs we create directories in afterEvaluate{}. It is
possible for the user's own afterEvaluate{} to change buildDir. In that
case, the task will output to the 'correct' directory but the mkdirs for
IDEs can be the 'old' buildDir. But users shouldn't be using
afterEvaluate{}, so we don't care and there's no real fix anyway.

Fixes google#674
    @ejona86
    ejona86 committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    c5bd183 View commit details
    Browse the repository at this point in the history

  6. Upgrade osdetector-gradle-plugin to 1.7.3

    @ejona86
    ejona86 committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    fd0664d View commit details
    Browse the repository at this point in the history