Skip to content

Commit

Permalink
Merge pull request #74 from jwharm/upgrade-cairo-1-18
Browse files Browse the repository at this point in the history
Upgrade cairo to 1.18.0
jwharm authored Oct 14, 2023
2 parents 1d5ad54 + bee3ce8 commit 781a14f
Showing 6 changed files with 12 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -60,14 +60,14 @@ public abstract class GenerateSources extends DefaultTask {
@TaskAction
void execute() {
try {
Module windows = parse(Platform.WINDOWS, getInputDirectory().get(), getGirFile().get(),
getUrlPrefix().getOrElse(null), getPatch().getOrElse(null));
Module linux = parse(Platform.LINUX, getInputDirectory().get(), getGirFile().get(),
getUrlPrefix().getOrElse(null), getPatch().getOrElse(null));
Module windows = parse(Platform.WINDOWS, getInputDirectory().get(), getGirFile().get(),
getUrlPrefix().getOrElse(null), getPatch().getOrElse(null));
Module macos = parse(Platform.MACOS, getInputDirectory().get(), getGirFile().get(),
getUrlPrefix().getOrElse(null), getPatch().getOrElse(null));

Module module = new Merge().merge(windows, linux, macos);
Module module = new Merge().merge(linux, windows, macos);

for (Repository repository : module.repositories.values()) {
if (repository.generate) {
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@

import io.github.jwharm.javagi.model.*;
import io.github.jwharm.javagi.model.Class;
import io.github.jwharm.javagi.model.Enumeration;
import io.github.jwharm.javagi.model.Module;
import io.github.jwharm.javagi.model.Record;

@@ -153,6 +154,10 @@ private void mergeRegisteredTypes(Namespace multi, List<Namespace> namespaces) {
multi.aliasList.add(alias);
} else if (rt instanceof Class cls) {
multi.classList.add(cls);
} else if (rt instanceof Bitfield flag) {
multi.bitfieldList.add(flag);
} else if (rt instanceof Enumeration enu) {
multi.enumerationList.add(enu);
}
}
}
2 changes: 1 addition & 1 deletion modules/gdk/build.gradle
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ dependencies {
api project(':gio')
api project(':pango')
api project(':pangocairo')
api 'io.github.jwharm.cairobindings:cairo:1.16.2'
api 'io.github.jwharm.cairobindings:cairo:1.18.0'
}

tasks.named('generateSources') {
2 changes: 1 addition & 1 deletion modules/harfbuzz/build.gradle
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ plugins {

dependencies {
api project(':gobject')
api 'io.github.jwharm.cairobindings:cairo:1.16.2'
api 'io.github.jwharm.cairobindings:cairo:1.18.0'
}

tasks.named('generateSources') {
2 changes: 1 addition & 1 deletion modules/pango/build.gradle
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ dependencies {
api project(':gobject')
api project(':gio')
api project(':harfbuzz')
api 'io.github.jwharm.cairobindings:cairo:1.16.2'
api 'io.github.jwharm.cairobindings:cairo:1.18.0'
}

tasks.named('generateSources') {
2 changes: 1 addition & 1 deletion modules/pangocairo/build.gradle
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ plugins {
dependencies {
api project(':gobject')
api project(':pango')
api 'io.github.jwharm.cairobindings:cairo:1.16.2'
api 'io.github.jwharm.cairobindings:cairo:1.18.0'
}

tasks.named('generateSources') {

0 comments on commit 781a14f

Please sign in to comment.