-
Notifications
You must be signed in to change notification settings - Fork 10.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[release/9.0] Use MacOS-13 in CI (#58546)
* Use MacOS-13 in CI * Gradle 6.9 * Update gradle-wrapper.properties * Update gradle-wrapper.properties * Update build.gradle * Update build.gradle * Update build.gradle * Update build.gradle * Update build.gradle * Update build.gradle * Update build.gradle * Fixup gradle --------- Co-authored-by: William Godbe <wigodbe@microsoft.com> Co-authored-by: Brennan <brecon@microsoft.com>
- Loading branch information
3 people
authored
Oct 21, 2024
1 parent
6cdcff9
commit ff8e369
Showing
10 changed files
with
157 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionSha256Sum=23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip | ||
| distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
78 changes: 43 additions & 35 deletions
78
src/SignalR/clients/java/signalr/messagepack/build.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,64 @@ | ||
| plugins { | ||
| id 'java' | ||
| id 'maven' | ||
| id 'maven-publish' | ||
| } | ||
|
|
||
| group 'com.microsoft.signalr.messagepack' | ||
|
|
||
| java | ||
| { | ||
| withJavadocJar() | ||
| withSourcesJar() | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation project(':core') | ||
| compile 'org.msgpack:msgpack-core:0.8.20' | ||
| compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' | ||
| implementation 'org.msgpack:msgpack-core:0.8.20' | ||
| implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.20' | ||
| } | ||
|
|
||
| archivesBaseName = 'signalr-messagepack' | ||
|
|
||
| task sourceJar(type: Jar) { | ||
| classifier "sources" | ||
| from sourceSets.main.allJava | ||
| base { | ||
| archivesName = 'signalr-messagepack' | ||
| } | ||
|
|
||
| task javadocJar(type: Jar, dependsOn: javadoc) { | ||
| classifier "javadoc" | ||
| from javadoc.destinationDir | ||
| } | ||
| publishing { | ||
| publications { | ||
| release(MavenPublication) { | ||
| from components.java | ||
|
|
||
| task generatePOM { | ||
| pom { | ||
| project { | ||
| artifactId 'signalr-messagepack' | ||
| inceptionYear '2020' | ||
| description 'MessagePack protocol implementation for ASP.NET Core SignalR Client for Java applications' | ||
| url 'https://github.com/dotnet/aspnetcore' | ||
| name groupId + ':' + artifactId | ||
| licenses { | ||
| license { | ||
| name 'MIT License' | ||
| url 'https://opensource.org/licenses/MIT' | ||
| distribution 'repo' | ||
|
|
||
| pom { | ||
| packaging = 'jar' | ||
| inceptionYear = '2020' | ||
| url = 'https://github.com/dotnet/aspnetcore' | ||
| name = groupId + ':' + artifactId | ||
| licenses { | ||
| license { | ||
| name = 'MIT License' | ||
| url = 'https://opensource.org/licenses/MIT' | ||
| distribution = 'repo' | ||
| } | ||
| } | ||
| } | ||
| scm { | ||
| connection 'scm:git:https://github.com/dotnet/aspnetcore.git' | ||
| developerConnection 'scm:git:https://github.com/dotnet/aspnetcore.git' | ||
| url 'https://github.com/dotnet/aspnetcore/tree/main' | ||
| } | ||
| developers { | ||
| developer { | ||
| id 'microsoft' | ||
| name 'Microsoft' | ||
| scm { | ||
| connection = 'scm:git:https://github.com/dotnet/aspnetcore.git' | ||
| developerConnection = 'scm:git:https://github.com/dotnet/aspnetcore.git' | ||
| url = 'https://github.com/dotnet/aspnetcore/tree/main' | ||
| } | ||
| developers { | ||
| developer { | ||
| id = 'microsoft' | ||
| name = 'Microsoft' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }.writeTo("${buildDir}/libs/signalr-messagepack-${project.version}.pom") | ||
| } | ||
| } | ||
|
|
||
| task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) | ||
| tasks.withType(GenerateMavenPom).all { | ||
| def matcher = name =~ /generatePomFileFor(\w+)Publication/ | ||
| def publicationName = matcher[0][1] | ||
| destination = layout.buildDirectory.file("libs/signalr-messagepack-${project.version}.pom").get().asFile | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,61 @@ | ||
| apply plugin: 'org.junit.platform.gradle.plugin' | ||
| plugins { | ||
| id 'java' | ||
| } | ||
|
|
||
| configurations { | ||
| antJUnit | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' | ||
| compile 'org.junit.jupiter:junit-jupiter-params:5.3.1' | ||
| runtime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' | ||
| implementation 'org.junit.jupiter:junit-jupiter-params:5.11.2' | ||
| testImplementation 'org.junit.jupiter:junit-jupiter:5.11.2' | ||
| testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2' | ||
| implementation 'com.google.code.gson:gson:2.8.5' | ||
| compile 'ch.qos.logback:logback-classic:1.2.3' | ||
| implementation 'ch.qos.logback:logback-classic:1.2.3' | ||
| implementation project(':core') | ||
| implementation project(':messagepack') | ||
| compile project(':messagepack') | ||
| implementation project(':messagepack') | ||
| antJUnit 'org.apache.ant:ant-junit:1.10.15' | ||
| } | ||
|
|
||
| sourceSets { | ||
| test { | ||
| java { | ||
| srcDir 'src' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| test { | ||
| useJUnitPlatform() | ||
| testLogging { | ||
| events "passed", "skipped", "failed" | ||
| } | ||
|
|
||
| reports { | ||
| html.required = false | ||
| junitXml.outputPerTestCase = true | ||
| junitXml.required = true | ||
| } | ||
| } | ||
|
|
||
| // Merge test results into a single file for Helix to detect JUnit test file | ||
| task testReport { | ||
| ext { | ||
| resultsDir = file("$buildDir/test-results") | ||
| mergedFile = "test-results/junit-results.xml" | ||
| } | ||
|
|
||
| doLast { | ||
| mkdir 'test-results' | ||
| ant.taskdef(name: 'junitreport', | ||
| classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator', | ||
| classpath: configurations.antJUnit.asPath) | ||
|
|
||
| ant.junitreport(tofile: mergedFile) { | ||
| fileset(dir: resultsDir, includes: '**/TEST-*.xml') | ||
| } | ||
| } | ||
| } | ||
|
|
||
| junitPlatform { | ||
| reportsDir file('test-results') | ||
| } | ||
| test.finalizedBy(testReport) |