Skip to content

Commit

Permalink
Updated to FRC 2020 libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
PHenegan committed Jan 13, 2020
1 parent 0a15546 commit e551f4d
Show file tree
Hide file tree
Showing 10 changed files with 211 additions and 207 deletions.
253 changes: 97 additions & 156 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,75 +1,38 @@

# Created by https://www.gitignore.io/api/java,gradle,eclipse,jetbrains+all,visualstudiocode
# Edit at https://www.gitignore.io/?templates=java,gradle,eclipse,jetbrains+all,visualstudiocode

### Eclipse ###
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# PyDev specific (Python IDE for Eclipse)
*.pydevproject

# CDT-specific (C/C++ Development Tooling)
.cproject

# CDT- autotools
.autotools

# Java annotation processor (APT)
.factorypath

# PDT-specific (PHP Development Tools)
.buildpath

# sbteclipse plugin
.target

# Tern plugin
.tern-project

# TeXlipse plugin
.texlipse

# STS (Spring Tool Suite)
.springBeans

# Code Recommenders
.recommenders/

# Annotation Processing
.apt_generated/

# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet

### Eclipse Patch ###
# Eclipse Core
.project

# JDT-specific (Eclipse Java Development Tools)
.classpath

# Annotation Processing
.apt_generated

.sts4-cache/
# Created by https://www.gitignore.io/api/c++,java,linux,macos,gradle,windows,visualstudiocode

### C++ ###
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

### Java ###
# Compiled class file
Expand All @@ -96,106 +59,80 @@ local.properties
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

### JetBrains+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# 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

# 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
### Linux ###
*~

# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
# KDE directory preferences
.directory

# CMake
cmake-build-*/
# Linux trash folder which might appear on any partition or disk
.Trash-*

# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# .nfs files are created when an open file is removed but is still being accessed
.nfs*

# File-based project format
*.iws
### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# IntelliJ
out/
# Icon must end with two \r
Icon

# mpeltonen/sbt-idea plugin
.idea_modules/
# Thumbnails
._*

# JIRA plugin
atlassian-ide-plugin.xml
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Cursive Clojure plugin
.idea/replstate.xml
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# 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

### JetBrains+all Patch ###
# Ignores the whole .idea folder and all .iml files
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
### VisualStudioCode ###
.vscode/

.idea/
### Windows ###
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
# Dump file
*.stackdump

*.iml
modules.xml
.idea/misc.xml
*.ipr
# Folder config file
[Dd]esktop.ini

# Sonarlint plugin
.idea/sonarlint
# Recycle Bin used on file shares
$RECYCLE.BIN/

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

### VisualStudioCode Patch ###
# Ignore all local history of files
.history
# Windows shortcuts
*.lnk

### Gradle ###
.gradle
build/
/build/

# Ignore Gradle GUI config
gradle-app.setting
Expand All @@ -209,7 +146,11 @@ gradle-app.setting
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties

### Gradle Patch ###
**/build/
# # VS Code Specific Java Settings
.classpath
.project
.settings/
bin/
imgui.ini

# End of https://www.gitignore.io/api/java,gradle,eclipse,jetbrains+all,visualstudiocode
# End of https://www.gitignore.io/api/c++,java,linux,macos,gradle,windows,visualstudiocode
6 changes: 6 additions & 0 deletions .wpilib/wpilib_preferences.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"enableCppIntellisense": false,
"currentLanguage": "java",
"projectYear": "2020",
"teamNumber": 555
}
15 changes: 1 addition & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1 @@
# Infinite Recharge

This is the official repository for First Robotics Competition Team 555's 2020 Season.

# Badges
[![Build Status](https://travis-ci.org/MontclairRobotics/InfiniteRecharge.svg?branch=Pre-Season-Setup)](https://travis-ci.org/MontclairRobotics/InfiniteRecharge) [![CodeFactor](https://www.codefactor.io/repository/github/montclairrobotics/infiniterecharge/badge)](https://www.codefactor.io/repository/github/montclairrobotics/infiniterecharge)

# Commonly Used Gradle Tasks
Here's a collection of some useful GradleRIO commands and tips for development. Reading the full documentation [here](https://github.com/Open-RIO/GradleRIO) is recommended.

- `clean` will clean your code.
- `build` will build your code.
- `deploy` will build and deploy your code.
- `shuffleboard` will launch Shuffleboard.
# InfiniteRecharge
28 changes: 16 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2019.4.1"
id "edu.wpi.first.GradleRIO" version "2020.1.2"
}

sourceCompatibility = JavaVersion.VERSION_11
Expand All @@ -17,7 +17,7 @@ deploy {
// or from command line. If not found an exception will be thrown.
// You can use getTeamOrDefault(team) instead of getTeamNumber if you
// want to store a team number in this file.
team = 555
team = frc.getTeamNumber()
}
}
artifacts {
Expand All @@ -38,27 +38,31 @@ deploy {
}

// Set this to true to enable desktop support.
def includeDesktopSupport = false

// Maven central needed for JUnit
repositories {
mavenCentral()
}
def includeDesktopSupport = true

// Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
// Also defines JUnit 4.
dependencies {
compile wpi.deps.wpilib()
compile wpi.deps.vendor.java()
implementation wpi.deps.wpilib()
nativeZip wpi.deps.wpilibJni(wpi.platforms.roborio)
nativeDesktopZip wpi.deps.wpilibJni(wpi.platforms.desktop)


implementation wpi.deps.vendor.java()
nativeZip wpi.deps.vendor.jni(wpi.platforms.roborio)
nativeDesktopZip wpi.deps.vendor.jni(wpi.platforms.desktop)
testCompile 'junit:junit:4.12'

testImplementation 'junit:junit:4.12'

// Enable simulation gui support. Must check the box in vscode to enable support
// upon debugging
simulation wpi.deps.sim.gui(wpi.platforms.desktop, false)
}

// Setting up my Jar File. In this case, adding all libraries into the main jar ('fat jar')
// in order to make them all available at runtime. Also adding the manifest so WPILib
// knows where to look for our Robot Class.
jar {
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
manifest edu.wpi.first.gradlerio.GradleRIOPlugin.javaManifest(ROBOT_MAIN_CLASS)
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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=permwrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=permwrapper/dists
Loading

0 comments on commit e551f4d

Please sign in to comment.