Skip to content

Commit

Permalink
Merge pull request #270 from Bram-Hub/dev
Browse files Browse the repository at this point in the history
Summer 2022 Semester Push
  • Loading branch information
Chase-Grajeda authored Aug 17, 2022
2 parents 5491038 + fa4b774 commit fbe6267
Show file tree
Hide file tree
Showing 2,362 changed files with 13,316 additions and 26,664 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Bug report
description: Create a report to help us improve
title: "[BUG] <description>"
labels: [bug]
labels: [ bug ]
body:
- type: textarea
id: description
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/enhancement_request.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Enhancement request
description: Improve an already-existing feature
title: "[ENHANCEMENT] <description>"
labels: [enhancement]
labels: [ enhancement ]
body:
- type: textarea
id: current_behavior
Expand Down
6 changes: 5 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
name: Feature request
description: Suggest an idea for this project
title: "[FEATURE] <description>"
labels: [new feature]
<<<<<<< HEAD
labels: [ new feature ]
=======
labels: [ enhancement, new feature ]
>>>>>>> b28ba6c38166142ecd457ffee2797fffc89a51b4
body:
- type: textarea
id: description
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change. -->

<!-- If your pull request is not related to a particular issue, delete the statement below. -->
Closes #(issue)
Closes #(issue)

## Type of change

Expand Down
34 changes: 23 additions & 11 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,34 @@ name: Java CI with Gradle

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build -x test
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build -x test

checkstyle:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: gradlew executable
run: chmod +x gradlew
- name: Run checkstyle
run: ./gradlew check
137 changes: 133 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,134 @@
.gradle/*
### Intellij+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# Development builds
out/
build/
bin/

# Native files generated on build, not needed in git
native/windows/lib
native/windows/bin/*

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Intellij+all Patch ###
# Ignore everything but code style settings and run configurations
# that are supposed to be shared within teams.

.idea/*
out/*
build/*
.DS_Store

!.idea/codeStyles
!.idea/runConfigurations

### Java ###
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

### Gradle ###
.gradle
**/build/
!src/**/build/

# Ignore Gradle GUI config
gradle-app.setting

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar

# Avoid ignore Gradle wrappper properties
!gradle-wrapper.properties

# Cache of project
.gradletasknamecache

# Eclipse Gradle plugin generated files
# Eclipse Core
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath

# End of https://www.toptal.com/developers/gitignore/api/intellij+all,gradle,java

**/.DS_Store
gradle/wrapper/gradle-wrapper.properties
13 changes: 13 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions .idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

12 changes: 0 additions & 12 deletions CONTRIBUTING.md

This file was deleted.

3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
```

Some of the icons used in Legup were taken from or derived from the icons found on https://fonts.google.com/icons, which
is licensed under the [Apache-2.0 license](https://www.apache.org/licenses/LICENSE-2.0.html).
3 changes: 0 additions & 3 deletions bin/main/edu/.idea/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions bin/main/edu/.idea/.gitignore 2

This file was deleted.

9 changes: 0 additions & 9 deletions bin/main/edu/.idea/edu.iml

This file was deleted.

6 changes: 0 additions & 6 deletions bin/main/edu/.idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions bin/main/edu/.idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions bin/main/edu/.idea/vcs.xml

This file was deleted.

62 changes: 0 additions & 62 deletions bin/main/edu/build.gradle

This file was deleted.

Loading

0 comments on commit fbe6267

Please sign in to comment.