-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #401 from Bram-Hub/gradle
Gradle update Merging
- Loading branch information
Showing
33 changed files
with
322 additions
and
2,200 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# modified from https://github.com/MathieuSoysal/Javadoc-publisher.yml | ||
|
||
name: Publish Javadoc | ||
|
||
on: | ||
push: | ||
branches: | ||
- dev | ||
|
||
jobs: | ||
publish: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Publish JavaDoc | ||
uses: MathieuSoysal/[email protected] | ||
with: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
javadoc-branch: javadoc | ||
java-version: 8 | ||
target-folder: docs | ||
project: 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
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -0,0 +1,90 @@ | ||
plugins { | ||
`java-library` | ||
checkstyle | ||
id("edu.sc.seis.launch4j") version("2.5.3") | ||
id("com.github.johnrengelman.shadow") version "4.0.4" | ||
} | ||
repositories { | ||
mavenCentral() | ||
} | ||
|
||
|
||
/* Maven artifact coordinates */ | ||
group = "edu.rpi.Legup" | ||
version = "2.0.0" | ||
val artifactId = "Legup" | ||
|
||
/* important / reused build properties */ | ||
object BuildProps { | ||
const val mainClassName = "edu.rpi.legup.Legup" | ||
const val splashImagePath = "edu/rpi/legup/images/Legup/LegupSplash.png" | ||
val minJavaVersion = JavaVersion.VERSION_1_8 | ||
const val minJavaVersionString = "1.8.0" | ||
} | ||
|
||
|
||
java { | ||
sourceCompatibility = BuildProps.minJavaVersion | ||
targetCompatibility = BuildProps.minJavaVersion | ||
} | ||
|
||
dependencies { | ||
implementation("org.jetbrains:annotations:23.0.0") | ||
implementation("org.apache.httpcomponents:httpclient:4.5.13") | ||
api("org.slf4j:slf4j-api:2.0.4") | ||
api("org.slf4j:slf4j-simple:2.0.4") | ||
api("org.apache.logging.log4j:log4j-api:2.19.0") | ||
api("org.apache.logging.log4j:log4j-core:2.19.0") | ||
api("org.apache.commons:commons-lang3:3.12.0") | ||
testImplementation("junit:junit:4.13.2") | ||
} | ||
|
||
tasks { | ||
jar { | ||
manifest { | ||
attributes( | ||
"Implementation-Title" to artifactId, | ||
"Implementation-Version" to project.version, | ||
"Main-Class" to BuildProps.mainClassName, | ||
"SplashScreen-Image" to BuildProps.splashImagePath | ||
) | ||
} | ||
} | ||
|
||
javadoc { | ||
// prevent javadoc task failure from semantic errors in Javadoc -- errors will still be logged | ||
isFailOnError = false | ||
} | ||
|
||
/* | ||
* CREATES NATIVE WINDOWS EXECUTABLE | ||
* Launches launch4j to create an executable (.exe) file wrapping the jar | ||
* THIS IS NOT THE INSTALLER | ||
* Add "icon = "path/to/icon.ico"" to set an icon for the executable | ||
*/ | ||
createExe { | ||
mainClassName = BuildProps.mainClassName | ||
outputDir = "../native/windows" | ||
outfile = "bin/Legup.exe" | ||
bundledJrePath = "jre" | ||
bundledJre64Bit = true | ||
jdkPreference = "preferJre" | ||
jreMinVersion = BuildProps.minJavaVersionString | ||
jreRuntimeBits = "64/32" | ||
} | ||
|
||
/* | ||
* CREATES NATIVE WINDOWS INSTALLER -- ONLY RUNS ON WINDOWS | ||
* Runs the shipped version of Inno Setup (6.2) to compile the installer | ||
* Modify the setup settings in native/windows/legup_inno_setup.iss | ||
* | ||
* Modifications are likely required to run the setup script on your computer: | ||
* Edit the "CHANGE ME" line in native/windows/legup_inno_setup.iss to reflect | ||
* the path to the Java installation you want to ship inside the executable. | ||
*/ | ||
register<Exec>("buildNativeWindows") { | ||
dependsOn(shadowJar, createExe) | ||
workingDir = File("${project.buildDir}/../native/windows") | ||
commandLine("cmd", "/c", "make_windows_installer.bat") | ||
} | ||
} |
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,5 +1,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
112 changes: 0 additions & 112 deletions
112
legup-update/src/main/java/edu/rpi/legupupdate/NetUtil.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.