From 0f83dc64917e999acdd29b1a3c8075ec6141cb67 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Fri, 19 Jan 2024 20:04:29 +0100 Subject: [PATCH] sponsorship link. error sorting. version. --- README.md | 3 ++- compiler/src/prog8/buildversion/BuildVersion.kt | 12 ++++++------ compiler/src/prog8/compiler/ErrorReporter.kt | 2 +- gradle.properties | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e2bd3e8ee..8378105c5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/H2H6S0FFF) [![Documentation](https://readthedocs.org/projects/prog8/badge/?version=latest)](https://prog8.readthedocs.io/) Prog8 - Structured Programming Language for 8-bit 6502/65c02 microprocessors @@ -13,7 +14,7 @@ which aims to provide many conveniences over raw assembly code (even when using This project was created over the last couple of years by dedicating thousands of hours of my free time to it, to make it the best I possibly can. If you like Prog8, and think it's worth a nice cup of hot coffee or a delicious pizza, -you can help me out a little bit over at [ko-fi.com/irmen](https://ko-fi.com/irmen). +you can help me out a little bit over at [ko-fi.com/irmen](https://ko-fi.com/irmen). Documentation diff --git a/compiler/src/prog8/buildversion/BuildVersion.kt b/compiler/src/prog8/buildversion/BuildVersion.kt index bca8a5e49..5a9521c87 100644 --- a/compiler/src/prog8/buildversion/BuildVersion.kt +++ b/compiler/src/prog8/buildversion/BuildVersion.kt @@ -5,11 +5,11 @@ package prog8.buildversion */ const val MAVEN_GROUP = "prog8" const val MAVEN_NAME = "compiler" -const val VERSION = "10.0-SNAPSHOT" -const val GIT_REVISION = 4405 -const val GIT_SHA = "69075376dc26f06b7422f47529f90577f4213aaf" -const val GIT_DATE = "2024-01-17T20:24:41Z" +const val VERSION = "10.0" +const val GIT_REVISION = -1 +const val GIT_SHA = "cc22861719e36ed842d00d6ca7c29792c2c37b9f" +const val GIT_DATE = "2024-01-19T18:26:41Z" const val GIT_BRANCH = "master" -const val BUILD_DATE = "2024-01-17T21:46:56Z" -const val BUILD_UNIX_TIME = 1705528016840L +const val BUILD_DATE = "2024-01-19T18:58:11Z" +const val BUILD_UNIX_TIME = 1705690691084L const val DIRTY = 1 diff --git a/compiler/src/prog8/compiler/ErrorReporter.kt b/compiler/src/prog8/compiler/ErrorReporter.kt index e0be2d7cc..5e7b93e31 100644 --- a/compiler/src/prog8/compiler/ErrorReporter.kt +++ b/compiler/src/prog8/compiler/ErrorReporter.kt @@ -33,7 +33,7 @@ internal class ErrorReporter: IErrorReporter { var numErrors = 0 var numWarnings = 0 var numInfos = 0 - messages.forEach { + messages.sortedWith(compareBy({it.position.file}, {it.position.line}, {it.severity})).forEach { val printer = when(it.severity) { MessageSeverity.INFO -> System.out MessageSeverity.WARNING -> System.out diff --git a/gradle.properties b/gradle.properties index d8e1ba651..be1056b30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ org.gradle.daemon=true kotlin.code.style=official javaVersion=11 kotlinVersion=1.9.22 -version=10.0-SNAPSHOT +version=10.0