Gradle cleanup (#1569)

* Remove intellij files from source control

* Remove old gradle provided

* Use javac release option

* Clean up .gitignore

* More cleanup

* Fix build

Author: trask

.gitignore

@@ -1,103 +1,7 @@
-#Visual Studio files
-*.o
-*.d
-*.so
-*.class
-*.sdf
-*.opensdf
-*.suo
-*.user
-bin/
-Debug/
-Release/
-ipch/
-classpath.txt
-javaconfig.json
-
-# Eclipse
-.classpath
-.project
-.settings/
-
 # Gradle
-.gradle
+/.gradle/
+/buildSrc/.gradle/
 build/
- 
-# Ignore Gradle GUI config 
-gradle-app.setting
-
-
-# Ignore all xml in idea (keep codeStyles)
-.idea/*.xml
-
-## Directory-based project format:
-# User-specific stuff:
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/dictionaries
-
- 
-# Sensitive or high-churn files: 
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-
- 
-# Gradle: 
-.idea/gradle.xml
-.idea/libraries
-
- 
-# Mongo Explorer plugin: 
-.idea/mongoSettings.xml
-
- 
-## File-based project format: 
-*.ipr 
-*.iws 
-
- 
-## Plugin-specific files: 
- 
-# IntelliJ 
-out/
- 
-# mpeltonen/sbt-idea plugin 
-.idea_modules/ 
-
- 
-# JIRA plugin 
-atlassian-ide-plugin.xml 
- 
- 
-# Crashlytics plugin (for Android Studio and IntelliJ) 
-com_crashlytics_export_strings.xml 
-
-# Mac
-.DS_Store
-
-# Click-Once directory
-publish/
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-/Backend/OrderService/.gradle/1.11/taskArtifacts
-/Backend/OrderService/build
-/Backend/OrderService/.idea
-Backend/OrderService/OrderService.iml
-
-# VS Code Workspace settings
-.vscode/settings.json
 
-# Visual Studio
-.vs
-.idea/.name
+# Intellij
+/.idea/

.idea/codeStyles/Project.xml

@@ -21,8 +21,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
  * DEALINGS IN THE SOFTWARE.
  */
 
-// region Common configurations
-
 plugins {
     id 'idea'
 
@@ -37,10 +35,6 @@ ext.buildScriptsDir = "$rootDir/gradle"
 
 apply from: "$buildScriptsDir/common.gradle"
 
-// endregion Common configurations
-
-// region Root project script
-
 ext {
     isBuildServer = (System.properties["isBuildServer"] ?: "false").toBoolean()
     isRelease = (System.properties["isRelease"] ?: "false").toBoolean()
@@ -85,15 +79,6 @@ allprojects {
         }
     }
 
-    tasks.withType(JavaCompile) {
-        doFirst {
-            logger.info("sourceCompatibility = $sourceCompatibility")
-            logger.info("tatgetCompatibility = $targetCompatibility")
-            logger.info("options.bootstrapClasspath = $options.bootstrapClasspath")
-            logger.info("options.compilerArgs = $options.compilerArgs")
-        }
-    }
-
     tasks.withType(ShadowJar) {
         exclude 'META-INF/maven/**'
         exclude 'META-INF/LICENSE*'
@@ -108,10 +93,3 @@ allprojects {
         from "${rootProject.projectDir}/LICENSE"
     }
 }
-
-wrapper {
-    distributionType = Wrapper.DistributionType.ALL
-}
-
-// endregion Root project script
-

.idea/codeStyles/codeStyleConfig.xml

@@ -36,8 +36,6 @@ import com.microsoft.applicationinsights.build.tasks.PropsFileGen
 
 archivesBaseName = 'applicationinsights-core'
 
-apply from: "$buildScriptsDir/provided-configuration.gradle"
-
 configurations {
     forTheDLL { transitive = false }
 }

build.gradle

@@ -15,12 +15,9 @@ repositories {
 apply plugin: 'war'
 apply plugin: 'org.springframework.boot'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
 dependencies {
-    providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
-    providedCompile project(path:':agent:agent', configuration:'devtest')
+    compileOnly 'javax.servlet:javax.servlet-api:3.0.1'
+    compileOnly project(path:':agent:agent', configuration:'devtest')
 
     implementation ('org.springframework.boot:spring-boot-starter-web:2.1.7.RELEASE') {
         exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
@@ -29,3 +26,7 @@ dependencies {
 
     testImplementation 'junit:junit:4.12'
 }
+
+tasks.withType(JavaCompile) {
+    options.release.set(8)
+}

core/build.gradle

@@ -27,7 +27,6 @@ repositories {
 }
 
 apply from: "$buildScriptsDir/common-java.gradle"
-apply from: "$buildScriptsDir/provided-configuration.gradle"
 
 configurations {
     jni64 {
@@ -36,10 +35,6 @@ configurations {
     jni32 {
         transitive = false
     }
-    provided {
-        transitive = false
-    }
-    testRuntime.extendsFrom provided
 }
 
 def jniSrcDir = 'src/main/jni'

etw/etw-testapp/build.gradle

@@ -21,7 +21,6 @@
 
 // region Shared java configuration
 
-import org.gradle.internal.os.OperatingSystem;
 import org.gradle.api.tasks.testing.logging.TestLogEvent;
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat;
 
@@ -31,9 +30,6 @@ apply plugin: 'checkstyle'
 apply plugin: 'org.owasp.dependencycheck'
 apply plugin: 'com.github.spotbugs'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
 configurations {
     compileClasspath.resolutionStrategy.activateDependencyLocking()
     runtimeClasspath.resolutionStrategy.activateDependencyLocking()
@@ -56,6 +52,7 @@ spotbugs {
         excludeFilter = spotbugsExcludeFile
     }
 }
+spotbugsTest.enabled = false
 
 spotbugsTest.enabled = false
 

etw/java/build.gradle

@@ -7,11 +7,13 @@ repositories {
 
 dependencies {
     compile 'com.google.guava:guava:23.0'
-    providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
+    compileOnly 'javax.servlet:javax.servlet-api:3.0.1'
     compile 'com.google.code.gson:gson:2.8.2'
     compile project(':core')
     compile project(':test:smoke:framework:utils')
 
 }
 
-sourceCompatibility = 1.8
+tasks.withType(JavaCompile) {
+    options.release.set(8)
+}

gradle/common-java.gradle

@@ -16,4 +16,6 @@ dependencies {
 
 mainClassName = 'com.microsoft.applicationinsights.test.fakeingestion.MockedAppInsightsIngestionServer'
 
-sourceCompatibility = 1.8
+tasks.withType(JavaCompile) {
+    options.release.set(8)
+}

gradle/provided-configuration.gradle

@@ -13,4 +13,6 @@ dependencies {
     compile project(':test:fakeIngestion:standalone')
 }
 
-sourceCompatibility = 1.8
+tasks.withType(JavaCompile) {
+    options.release.set(8)
+}

test/fakeIngestion/servlet/build.gradle

@@ -15,4 +15,6 @@ dependencies {
     testCompile 'junit:junit:4.12'
 }
 
-sourceCompatibility = 1.8
+tasks.withType(JavaCompile) {
+    options.release.set(8)
+}

test/fakeIngestion/standalone/build.gradle

@@ -3,15 +3,14 @@ plugins {
     id 'org.springframework.boot' version '2.1.7.RELEASE'
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-compileSmokeTestJava.sourceCompatibility = 1.8
-compileSmokeTestJava.targetCompatibility = 1.8
-
 ext.testAppArtifactDir = jar.destinationDirectory
 ext.testAppArtifactFilename = jar.archiveFileName.get()
 
 dependencies {
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE'
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: '2.1.7.RELEASE'
 }
+
+tasks.withType(JavaCompile) {
+    options.release.set(8)
+}