Merge pull request #14 from square/develop

Consolidate versions and changelogs. Validate gradle wrapper.
square · Aug 7, 2023 · 1dfb915 · 1dfb915
2 parents 8815bd7 + 5e4fb92
commit 1dfb915
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 98 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,21 @@
+## Unreleased
+
+## v0.1.1
+- `tooling-support`: Fix crash from `SquareProjectModelBuilder` when used on a non-Java/Android project
+- `affected-paths-core`: Adds `autoInjectPlugin` flag to `CoreOptions`, which auto-injects the "com.squareup.tooling" plugin to the build
+
+## v0.1.0
+- Initial public release
+
+## v0.0.3
+- `tooling-support-core`: Close ServiceLoader stream once all extractors are found
+- `tooling-support`: Close ServiceLoader stream once all extractors are found
+- `affected-paths-core`: Allow for custom changed files to be analyzed
+
+## v0.0.2
+- `tooling-support-core`: Fix import statements
+- `tooling-support`: Fix ServiceLoader not loading `SquareProjectExtractor` implementations
+- `affected-paths-core`: Allow for SquareProject list to be provided to `CoreAnalyzer.analyze()`
+
+## v0.0.1
+- Initial Release
diff --git a/affected-paths/app/CHANGELOG.md b/affected-paths/app/CHANGELOG.md
diff --git a/affected-paths/core/CHANGELOG.md b/affected-paths/core/CHANGELOG.md
diff --git a/affected-paths/core/gradle.properties b/affected-paths/core/gradle.properties
@@ -1,5 +1,3 @@
-VERSION_NAME=0.1.1
-
 POM_ARTIFACT_ID=affected-paths-core
 POM_NAME=Affected-Paths Core
 POM_DESCRIPTION=Library containing core utilities used by affected-paths
diff --git a/gradle.properties b/gradle.properties
@@ -11,6 +11,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 kotlin.code.style=official
 
 GROUP=com.squareup.affected.paths
+VERSION_NAME=0.1.1
 
 POM_URL=https://github.com/squareup/affected-paths
 POM_SCM_URL=https://github.com/squareup/affected-paths

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

diff --git a/tooling/models/CHANGELOG.md b/tooling/models/CHANGELOG.md
diff --git a/tooling/models/gradle.properties b/tooling/models/gradle.properties
@@ -1,5 +1,3 @@
-VERSION_NAME=0.1.0
-
 POM_ARTIFACT_ID=tooling-models
 POM_NAME=Affected-Paths Tooling Models
 POM_DESCRIPTION=Tooling models used by affected-paths
diff --git a/tooling/support/CHANGELOG.md b/tooling/support/CHANGELOG.md
diff --git a/tooling/support/android/CHANGELOG.md b/tooling/support/android/CHANGELOG.md
diff --git a/tooling/support/android/gradle.properties b/tooling/support/android/gradle.properties
@@ -1,5 +1,3 @@
-VERSION_NAME=0.1.0
-
 POM_ARTIFACT_ID=tooling-support-android
 POM_NAME=Affected-Paths Tooling Android Library
 POM_DESCRIPTION=Library to provide Android extractors to the Affected-Paths Tooling plugin
diff --git a/tooling/support/core/CHANGELOG.md b/tooling/support/core/CHANGELOG.md
diff --git a/tooling/support/core/gradle.properties b/tooling/support/core/gradle.properties
@@ -1,5 +1,3 @@
-VERSION_NAME=0.1.0
-
 POM_ARTIFACT_ID=tooling-support-core
 POM_NAME=Affected-Paths Tooling Core library
 POM_DESCRIPTION=Core library to provide extractor interface to the Affected-Paths Tooling plugin
diff --git a/tooling/support/gradle.properties b/tooling/support/gradle.properties
@@ -1,5 +1,3 @@
-VERSION_NAME=0.1.1
-
 POM_ARTIFACT_ID=tooling-support
 POM_NAME=Affected-Paths Tooling Plugin
 POM_DESCRIPTION=Base library to provide affected-paths with Gradle models via the Gradle Tooling API
diff --git a/tooling/support/jvm/CHANGELOG.md b/tooling/support/jvm/CHANGELOG.md
diff --git a/tooling/support/jvm/gradle.properties b/tooling/support/jvm/gradle.properties
@@ -1,5 +1,3 @@
-VERSION_NAME=0.1.0
-
 POM_ARTIFACT_ID=tooling-support-jvm
 POM_NAME=Affected-Paths Tooling Jvm Library
 POM_DESCRIPTION=Library to provide Jvm extractors to the Affected-Paths Tooling plugin