Skip to content

Commit 199f328

Browse files
authored
Merge pull request #32 from asarkar/maintenance
Upgrade dependencies
2 parents ea59e2a + a592e03 commit 199f328

10 files changed

+26
-33
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/setup-java@v2
1616
with:
1717
distribution: 'zulu'
18-
java-version: 8
18+
java-version: 11
1919

2020
- name: Build and test
2121
run: ./gradlew clean build -x ktlintCheck -x ktlintFormat

.github/workflows/publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v2
1515

1616
- name: Inject slug/short variables
17-
uses: rlespinasse/github-slug-action@v3.x
17+
uses: rlespinasse/github-slug-action@v4
1818

1919
- name: Check CI status
2020
run: |
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/setup-java@v2
3333
with:
3434
distribution: 'zulu'
35-
java-version: 8
35+
java-version: 11
3636

3737
- name: Publish to Gradle Plugin Portal
3838
run: ./gradlew publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}

.github/workflows/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
stale:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/stale@v3
10+
- uses: actions/stale@v4
1111
with:
1212
stale-issue-message: "This issue is stale and will be closed in 5 days."
1313
stale-pr-message: "This PR is stale and will be closed in 5 days."

README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# build-time-tracker
22

3-
Gradle plugin that prints the time taken by the tasks in a build. Requires Java 8 or later.
3+
Gradle plugin that prints the time taken by the tasks in a build.
44

55
[![](https://github.com/asarkar/build-time-tracker/workflows/CI%20Pipeline/badge.svg)](https://github.com/asarkar/build-time-tracker/actions?query=workflow%3A%22CI+Pipeline%22)
66

@@ -51,11 +51,15 @@ Microsoft Excel. How to do this depends on the Operating System, and Excel versi
5151
[here](https://answers.microsoft.com/en-us/msoffice/forum/msoffice_excel-mso_mac-mso_365hp/how-to-open-utf-8-csv-file-in-excel-without-mis/1eb15700-d235-441e-8b99-db10fafff3c2)
5252
is one way.
5353

54+
## Minimum Requirements
55+
- Java 11
56+
- Gradle 6.1
57+
5458
## Contribute
5559

5660
This project is a volunteer effort. You are welcome to send pull requests, ask questions, or create issues. If you like
5761
it, you can help by spreading the word and "Starring" the GitHub repo!
5862

5963
## License
6064

61-
Copyright 2021 Abhijit Sarkar - Released under [Apache License v2.0](LICENSE).
65+
Copyright 2022 Abhijit Sarkar - Released under [Apache License v2.0](LICENSE).

build.gradle.kts

+7-3
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ dependencies {
5656
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
5757
kotlinOptions {
5858
freeCompilerArgs = listOf("-Xjsr305=strict", "-Xopt-in=kotlin.RequiresOptIn")
59-
jvmTarget = "1.8"
59+
jvmTarget = "11"
6060
}
6161
}
6262

6363
plugins.withType<JavaPlugin>().configureEach {
6464
extensions.configure<JavaPluginExtension> {
65-
sourceCompatibility = JavaVersion.VERSION_1_8
66-
targetCompatibility = JavaVersion.VERSION_1_8
65+
sourceCompatibility = JavaVersion.VERSION_11
66+
targetCompatibility = JavaVersion.VERSION_11
6767
}
6868
}
6969

@@ -81,3 +81,7 @@ publishing {
8181
}
8282
}
8383
}
84+
85+
tasks.wrapper {
86+
distributionType = Wrapper.DistributionType.BIN
87+
}

gradle.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ pluginImplementationClass = com.asarkar.gradle.buildtimetracker.BuildTimeTracker
1111
pluginDeclarationName = buildTimeTrackerPlugin
1212

1313
projectGroup = com.asarkar.gradle
14-
projectVersion = 3.0.1
14+
projectVersion = 4.0.0
1515

1616
junitVersion = latest.release
1717
assertjVersion = latest.release
1818

19-
kotlinPluginVersion = 1.4.31
20-
gradlePluginPublishVersion = 0.14.0
21-
ktlintVersion=10.0.0
19+
kotlinPluginVersion = 1.6.10
20+
gradlePluginPublishVersion = 0.20.0
21+
ktlintVersion=10.2.1

gradle/wrapper/gradle-wrapper.jar

293 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fi
130130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133-
133+
134134
JAVACMD=`cygpath --unix "$JAVACMD"`
135135

136136
# We build the pattern for arguments to be converted via cygpath

gradlew.bat

+3-18
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4040

4141
set JAVA_EXE=java.exe
4242
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
4444

4545
echo.
4646
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
5454
set JAVA_HOME=%JAVA_HOME:"=%
5555
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5656

57-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
5858

5959
echo.
6060
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
6464

6565
goto fail
6666

67-
:init
68-
@rem Get command-line arguments, handling Windows variants
69-
70-
if not "%OS%" == "Windows_NT" goto win9xME_args
71-
72-
:win9xME_args
73-
@rem Slurp the command line arguments.
74-
set CMD_LINE_ARGS=
75-
set _SKIP=2
76-
77-
:win9xME_args_slurp
78-
if "x%~1" == "x" goto execute
79-
80-
set CMD_LINE_ARGS=%*
81-
8267
:execute
8368
@rem Setup the command line
8469

8570
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8671

8772

8873
@rem Execute Gradle
89-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
9075

9176
:end
9277
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)