Skip to content

Commit da1bb96

Browse files
Update software stack and license information
1 parent f1e0578 commit da1bb96

19 files changed

Lines changed: 459 additions & 136 deletions

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
- master
88
- develop
99
docker:
10-
- image: maciejmalecki/c64libci:0.1.4
10+
- image: maciejmalecki/c64libci:0.1.7
1111

1212
working_directory: ~/repo
1313

@@ -18,4 +18,4 @@ jobs:
1818
steps:
1919
- checkout
2020

21-
- run: ./gradlew
21+
- run: ./gradlew licenseAsm build

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
build
88
*.dbg
99
*.vs
10+
*.specOut
1011
.idea
1112
.ra
1213
.vscode

LICENSE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
MIT License
22

3-
Copyright (c) 2018 c64lib
3+
Copyright (c) 2017-2032 c64lib
4+
Copyright (c) 2017-2023 Maciej Małecki
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy
67
of this software and associated documentation files (the "Software"), to deal

build.gradle

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,33 @@
11
plugins {
2-
id "com.github.c64lib.retro-assembler" version "1.4.5"
2+
id "com.github.c64lib.retro-assembler" version "1.6.0"
3+
id "com.github.hierynomus.license" version "0.16.1"
34
}
45

56
repositories {
67
mavenCentral()
78
}
89

10+
license {
11+
header = file("LICENSE")
12+
excludes([".ra"])
13+
include "**/*.asm"
14+
mapping {
15+
asm = 'SLASHSTAR_STYLE'
16+
}
17+
}
18+
19+
task licenseFormatAsm(type: com.hierynomus.gradle.license.tasks.LicenseFormat) {
20+
source = fileTree(dir: ".").include("**/*.asm").exclude(".ra")
21+
}
22+
task licenseAsm(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
23+
source = fileTree(dir: ".").include("**/*.asm").exclude(".ra")
24+
}
25+
licenseFormat.dependsOn licenseFormatAsm
26+
927
retroProject {
1028
dialect = "KickAssembler"
11-
dialectVersion = "5.22"
12-
libDirs = ["..", ".ra/deps/c64lib"]
29+
dialectVersion = "5.25"
30+
libDirs = [".ra/deps/c64lib"]
1331

1432
libFromGitHub "c64lib/common", "0.3.0"
1533
libFromGitHub "c64lib/64spec", "0.7.0pr"

examples/e01-raster-irq.asm

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
/*
2+
* MIT License
3+
*
4+
* Copyright (c) 2017-2032 c64lib
5+
* Copyright (c) 2017-2023 Maciej Małecki
6+
*
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in all
15+
* copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
* SOFTWARE.
24+
*/
125
/*
226
* Copper demo 1.
327
*/

gradle/wrapper/gradle-wrapper.jar

3.83 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)