Skip to content

Commit

Permalink
Rolled back to Java11 as SNAP Core 22 won't do 17
Browse files Browse the repository at this point in the history
  • Loading branch information
frossm committed Dec 3, 2023
1 parent 1c958d4 commit 8790473
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
Expand Down
6 changes: 3 additions & 3 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.compiler.source=11
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>org.fross</groupId>
<artifactId>cal</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
<packaging>jar</packaging>

<name>cal</name>
Expand Down Expand Up @@ -35,7 +35,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.release>11</maven.compiler.release>
</properties>

<build>
Expand Down Expand Up @@ -233,7 +233,7 @@
<dependency>
<groupId>org.fross</groupId>
<artifactId>library</artifactId>
<version>2023.12.02</version>
<version>2023.12.03</version>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: fcal
version: '2.5.3'
version: '2.5.4'
summary: Command line calendar display
description: |
fCal is a command line calendar utility. It will display a
Expand All @@ -24,7 +24,7 @@ parts:
plugin: maven
source: https://github.com/frossm/library.git
source-type: git
source-tag: 'v2023.12.02'
source-tag: 'v2023.12.03'
maven-options: [install]

cal:
Expand Down
20 changes: 0 additions & 20 deletions src/main/java/org/fross/cal/Calendar.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.Ansi.Attribute;
import org.fusesource.jansi.Ansi.Color;
import org.fusesource.jansi.AnsiConsole;

public class Calendar {
// Class Constants
Expand Down Expand Up @@ -396,23 +395,4 @@ public static String ColorizeDay(int day, int colorIndexFG, int colorIndexBG) {
}
}

/**
* JAnsi256Test(): Simple printout of colors to test jAnsi 256 on terminals
*
*/
public static void JAnsi256Test() {
// Test Foregrounds
Ansi ansi = Ansi.ansi();
for (int index = 0; index < 256; index++) {
ansi.fg(index).a("FG %d ".formatted(index));
}
AnsiConsole.out().println(ansi);

// Test Backgrounds
ansi = Ansi.ansi();
for (int index = 0; index < 256; index++) {
ansi.bg(index).a("BG %d ".formatted(index));
}
AnsiConsole.out().println(ansi);
}
}

0 comments on commit 8790473

Please sign in to comment.