Commit 6ca54136 authored by Semyon Levin's avatar Semyon Levin
Browse files

Merge branch 'develop' into 'master' 

Develop

See merge request !759
parents aefac067 b2eca6b2

build.gradle

+8 −8
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ buildscript { 
        .name

        .replaceFirst(/^kotlin-stdlib-(\d.+)\.jar$/, '$1')



    ext.jsoupVersion = '1.15.1'

    ext.jsoupVersion = '1.15.2'

    ext.spotbugsGradlePluginVersion = '2.0.0'

    ext.classgraphVersion = '4.8.147'

    ext.classgraphVersion = '4.8.149'



    repositories {

        mavenCentral()
@@ -27,7 +27,7 @@ buildscript { 
    }

    dependencies {

        //*

        classpath 'name.remal:gradle-plugins:1.5.1'

        classpath 'name.remal:gradle-plugins:1.6.0'

        /*/

        classpath 'name.remal:gradle-plugins:1.5.2-develop-SNAPSHOT'

        //*/
@@ -38,7 +38,7 @@ buildscript { 
        classpath "org.jsoup:jsoup:$jsoupVersion"

        classpath "io.github.classgraph:classgraph:$classgraphVersion"

        classpath 'com.google.javascript:closure-compiler:v20220502'

        classpath 'gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.4'

        classpath 'gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.5'

    }



    [
@@ -140,7 +140,7 @@ allprojects { 
        String asmVersion = '9.3'

        String okhttpVersion = '3.14.9'

        String jgitVersion = '5.13.1.202206130422-r'

        String spotbugsVersion = '4.7.0'

        String spotbugsVersion = '4.7.1'



        Configuration dependencyVersions = configurations.create('dependencyVersions') {

            extendsFrom = []
@@ -194,13 +194,13 @@ allprojects { 


                    // Test

                    "name.remal.tools.test:junit4:$remalToolsVersion",

                    'org.redundent:kotlin-xml-builder:1.7.4',

                    'org.redundent:kotlin-xml-builder:1.8.0',



                    // Jacoco

                    'org.jacoco:org.jacoco.core:0.8.8',



                    // Checkstyle

                    'com.puppycrawl.tools:checkstyle:10.3',

                    'com.puppycrawl.tools:checkstyle:10.3.1',



                    // Spotbugs:

                    "com.github.spotbugs:spotbugs-annotations:$spotbugsVersion",
@@ -391,7 +391,7 @@ dependencies { 
    api 'org.eclipse.jgit:org.eclipse.jgit'

    api 'org.eclipse.jgit:org.eclipse.jgit.ssh.jsch'



    api 'name.remal.gradle-plugins.test-source-sets:test-source-sets:2.2.2'

    api 'name.remal.gradle-plugins.test-source-sets:test-source-sets:2.2.3'





    testImplementation project(':gradle-plugins-kotlin-testing-dsl')

docs-src/plugins/name.remal.common-settings.md

+0 −5
Original line number Diff line number Diff line 
The plugin applies these plugins:



* [`idea`](https://docs.gradle.org/current/userguide/idea_plugin.html)

* [`name.remal.idea-settings`](name.remal.idea-settings.md)

* [`name.remal.idea-extended-settings`](name.remal.idea-extended-settings.md)

* [`eclipse`](https://docs.gradle.org/current/userguide/eclipse_plugin.html)

* [`name.remal.eclipse-settings`](name.remal.eclipse-settings.md)

* [`name.remal.gradle-wrapper-settings`](name.remal.gradle-wrapper-settings.md)

* [`name.remal.configuration-extensions`](name.remal.configuration-extensions.md)

* [`name.remal.dependencies-extensions`](name.remal.dependencies-extensions.md)

docs-src/plugins/name.remal.eclipse-settings.md

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
**This plugin works only if [`eclipse`](https://docs.gradle.org/current/userguide/eclipse_plugin.html) plugin is applied.**



* Apply [`eclipse`](https://docs.gradle.org/current/userguide/eclipse_plugin.html) and this plugins for all projects

* It turns ON downloading dependency javadoc artifacts.

* It turns ON downloading dependency sources artifacts.

docs-src/plugins/name.remal.idea-extended-settings.md

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
**This plugin works only if [`idea`](https://docs.gradle.org/current/userguide/idea_plugin.html) plugin is applied.**



The plugin applies [`name.remal.idea-settings`](name.remal.idea-settings.md) plugin.



 



This plugin:



* Registers all classes from `META-INF/services/name.remal.gradle_plugins.plugins.ide.idea.EntryPointAnnotation` classpath resources as IDEA entry-point annotations.

* Registers all classes from `META-INF/services/name.remal.gradle_plugins.plugins.ide.idea.WriteAnnotation` classpath resources as IDEA write annotations.

* Registers all classes from `META-INF/services/name.remal.gradle_plugins.plugins.ide.idea.NullableAnnotation` classpath resources as IDEA nullable annotations.

* Registers all classes from `META-INF/services/name.remal.gradle_plugins.plugins.ide.idea.NotNullAnnotation` classpath resources as IDEA not-null annotations.

* Registers default annotation-processing profile. If you don't delegate compilation, then annotation-processing profile should be configured to enable annotation-processing.

* Sets Checkstyle version for [Checkstyle-IDEA plugin](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) from [`checkstyle.toolVersion`](https://docs.gradle.org/current/dsl/org.gradle.api.plugins.quality.CheckstyleExtension.html#org.gradle.api.plugins.quality.CheckstyleExtension:toolVersion).

docs-src/plugins/name.remal.idea-external-annotations.md

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
**This plugin works only if [`idea`](https://docs.gradle.org/current/userguide/idea_plugin.html) plugin is applied.**



The plugin applies [`name.remal.idea-settings`](name.remal.idea-settings.md) plugin.



 



This plugin sets IDEA external annotations path to `file://$USER_HOME$/idea-external-annotations` if it's not defined for every dependency.