Skip to content
This repository was archived by the owner on Jan 8, 2025. It is now read-only.

Bump checkstyle from 8.2 to 8.29 #406

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ TMC-CLI is the command-line client for University of Helsinki's TestMyCode -fram

* Java Runtime Environment 8
* Linux, Mac OS X or Microsoft Windows
* Currently only limited support for Windows
* Other Unix-like systems may work, but are not tested
* If you want autocompletion, Bash or a Bash-compatible shell is required

Expand All @@ -33,6 +32,14 @@ curl -0 https://raw.githubusercontent.com/testmycode/tmc-cli/master/scripts/inst

TMC-CLI should now be installed. You can try running it with `tmc` in a new terminal.

### Using the Windows installer

Download this [installer](https://github.com/testmycode/tmc-cli/blob/master/installers/TMC-cli_0.9.3_installer.exe)

Run the installation wizard.

TMC-CLI should now be installed. You can try running it with `tmc` in PowerShell/Command Prompt/other terminal software.

### Manual installation

Download the latest [release](https://github.com/testmycode/tmc-cli/releases/latest). If you use Linux or OS X, choose "tmc". If you use Windows, choose "tmc-cli-[VERSION].jar".
Expand Down Expand Up @@ -62,6 +69,10 @@ Now that you've installed tmc-cli, you can view all available commands by runnin

Delete tmc from the directory where you downloaded it, .tmc-autocomplete.sh from your home directory and remove 'source $HOME/.tmc-autocomplete' from your shell rc file.

### On Windows

If you installed TMC-cli with the installer-exe found in this repository's installers-folder, you can just navigate to where you installed TMC-cli (probably C:\Program Files\TMC-cli), and run the uninstaller `unins000.exe` there.

## Manual

The Unix man page for tmc-cli is located in docs/tmc.1 in this repository. To view it, open it with `man -l tmc.1`.
Expand Down
Binary file added installers/TMC-cli_0.9.3_installer.exe
Binary file not shown.
30 changes: 13 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>fi.helsinki.cs.tmc.cli</groupId>
<artifactId>tmc-cli</artifactId>
<version>0.9.2</version>
<version>0.9.3</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -14,16 +14,12 @@

<repositories>
<repository>
<id>tmc</id>
<name>TMC repo</name>
<url>http://maven.testmycode.net/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
<id>maven.mooc.fi.releases</id>
<url>http://maven.mooc.fi/releases</url>
</repository>
<repository>
<id>maven.mooc.fi.snapshots</id>
<url>http://maven.mooc.fi/snapshots</url>
</repository>
</repositories>

Expand All @@ -36,7 +32,7 @@
<dependency>
<groupId>fi.helsinki.cs.tmc</groupId>
<artifactId>core</artifactId>
<version>0.10.12-SNAPSHOT</version>
<version>0.10.13-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand All @@ -46,7 +42,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.2</version>
<version>2.8.6</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -57,7 +53,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.25</version>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down Expand Up @@ -198,20 +194,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>3.1.0</version>
<configuration>
<configLocation>${basedir}/src/main/resources/google_checks.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<encoding>UTF-8</encoding>
<linkXRef>false</linkXRef>
<failOnViolation>true</failOnViolation>
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
<sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
</configuration>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.2</version>
<version>8.29</version>
</dependency>
</dependencies>
<executions>
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/fi/helsinki/cs/tmc/cli/Application.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;

/**
* The application class for the program.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ private String loadFile(String filename) {
}

try {
return IOUtils.toString(stream, StandardCharsets.UTF_8);
return IOUtils.toString(stream, StandardCharsets.UTF_8.toString());
} catch (IOException e) {
io.errorln("Encoding failure... REALLY???");
return null;
Expand Down
Loading