Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gradle #400

Merged
merged 25 commits into from
Dec 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3d96e13
Unify quotes as double quotes in build files - 1st step to .kts trans…
Millibyte1 Oct 11, 2022
2e3604d
Make all dependencies short-form
Millibyte1 Oct 11, 2022
d498979
Disambiguated assignment and invocation in 'build.gradle's
Millibyte1 Oct 20, 2022
31942ad
Disambiguated assignment and invocation in settings.gradle
Millibyte1 Oct 20, 2022
403fcb0
Hid some dependencies; removed unused apache commons dependency; remo…
Millibyte1 Oct 21, 2022
a5ec753
Unify quotes as double quotes in build files - 1st step to .kts trans…
Millibyte1 Oct 11, 2022
df8d48a
Make all dependencies short-form
Millibyte1 Oct 11, 2022
fc6b38d
Disambiguated assignment and invocation in 'build.gradle's
Millibyte1 Oct 20, 2022
eb61587
Disambiguated assignment and invocation in settings.gradle
Millibyte1 Oct 20, 2022
92ed726
Hid some dependencies; removed unused apache commons dependency; remo…
Millibyte1 Oct 21, 2022
2e2836c
Upgraded to Gradle 7.5.1
Millibyte1 Oct 25, 2022
810e322
Merge remote-tracking branch 'origin/gradle' into gradle
Millibyte1 Oct 25, 2022
1892c65
Refactored, removed firebase as a dependency
Millibyte1 Oct 26, 2022
22c4d91
removed legup.user package, removed submit from ProofEditorPanel (rq.…
Millibyte1 Oct 26, 2022
b55a756
Merge branch 'dev' into gradle
Millibyte1 Nov 11, 2022
ffd9b6e
Groovy -> Kotlin
Millibyte1 Dec 6, 2022
76f9dcc
Merge branch 'dev' into gradle
Millibyte1 Dec 6, 2022
d386733
Added workflow to automatically publish docs to `javadoc` branch on p…
Millibyte1 Dec 9, 2022
47b19d5
Changed trigger branch to javadoc-hosting for testing purposes
Millibyte1 Dec 9, 2022
cc9b299
Merge pull request #398 from Millibyte1/javadoc-hosting
Millibyte1 Dec 9, 2022
b345de6
merged dev into gradle
Millibyte1 Dec 9, 2022
577020f
Re-added apache commons dependency -- no longer unused
Millibyte1 Dec 9, 2022
31ce479
Removed capture of buildNativeWindows task to suppress unused val war…
Millibyte1 Dec 9, 2022
cac893c
Added flag to allow javadoc task to succeed with errors
Millibyte1 Dec 9, 2022
3aa1901
change trigger branch back to gradle to test on BramHub
Millibyte1 Dec 9, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .github/workflows/publish-javadoc.yml
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:
- gradle

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
2 changes: 1 addition & 1 deletion bin/main/edu/rpi/legup/legup/config
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<puzzle name="LightUp"
qualifiedClassName="edu.rpi.legup.puzzle.lightup.LightUp"
fileType=".xml"
fileCreationDisabled="false"/>
fileCreationDisabled="true"/>
<puzzle name="Masyu"
qualifiedClassName="edu.rpi.legup.puzzle.masyu.Masyu"
fileType=".xml"
Expand Down
108 changes: 0 additions & 108 deletions build.gradle

This file was deleted.

90 changes: 90 additions & 0 deletions build.gradle.kts
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")
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
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
Empty file modified gradlew
100644 → 100755
Empty file.
1 change: 0 additions & 1 deletion legup-update/bin/main/edu.rpi.legupupdate/VERSION

This file was deleted.

22 changes: 0 additions & 22 deletions legup-update/build.gradle

This file was deleted.

112 changes: 0 additions & 112 deletions legup-update/src/main/java/edu/rpi/legupupdate/NetUtil.java

This file was deleted.

Loading