Skip to content
This repository has been archived by the owner on Nov 2, 2021. It is now read-only.

Commit

Permalink
Merge pull request #21 from serivesmejia/dev
Browse files Browse the repository at this point in the history
Merge dev into master for 2.1.0
  • Loading branch information
serivesmejia authored Jan 30, 2021
2 parents bccaf60 + 6fd5c1e commit c98a399
Show file tree
Hide file tree
Showing 96 changed files with 4,425 additions and 1,152 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,4 @@ fabric.properties
*.log

**/build/*
*.DS_Store
2 changes: 1 addition & 1 deletion .replit
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
language = "java10"
run = "chmod +x gradlew && ./gradlew :TeamCode:runSimulator"
run = "chmod +x gradlew && ./gradlew runSim"
4 changes: 2 additions & 2 deletions .run/Run Simulator.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/TeamCode" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="scriptParameters" value="--stacktrace" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":TeamCode:runSimulator" />
<option value="runSim" />
</list>
</option>
<option name="vmOptions" value="-Xms20m -Xmx100m" />
Expand Down
14 changes: 3 additions & 11 deletions EOCV-Sim/build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
plugins {
id 'java'
id 'maven'
id 'org.jetbrains.kotlin.jvm' version '1.4.30-M1'
}

group 'com.github.serivesmejia'
version '2.0.0'

java {
sourceCompatibility = JavaVersion.VERSION_1_9
targetCompatibility = JavaVersion.VERSION_1_9
}

repositories {
mavenCentral()
}
apply from: '../build.common.gradle'

dependencies {
implementation 'org.openpnp:opencv:4.3.0-2'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'io.github.classgraph:classgraph:4.8.94'
implementation 'com.formdev:flatlaf:0.45'
implementation 'com.formdev:flatlaf-intellij-themes:0.45'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
}
216 changes: 0 additions & 216 deletions EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/EOCVSim.java

This file was deleted.

Loading

0 comments on commit c98a399

Please sign in to comment.