gtk-rs · bilelmoussaoui · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024 · Jan 26, 2024
diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build-deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: build
     steps:
       - uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
           destination_dir: book
 
   codespell:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: codespell-project/actions-codespell@master

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build-deploy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
         toolchain: [stable]
 
     defaults:
@@ -48,31 +48,26 @@ jobs:
         with:
           path: target
           key: checks-${{ runner.os }}-cargo-target-dir-${{ steps.toolchain.outputs.rustc_hash }}
-      - name: Install packages from apt
-        run: |
-          sudo apt update
-          sudo apt install libgtk-3-dev libssh2-1-dev libglib2.0-dev libgraphene-1.0-dev libcairo-gobject2 libcairo2-dev
-        if: matrix.os == 'ubuntu-20.04'
       - name: "Run clippy"
         uses: actions-rs/cargo@v1
         with:
           command: clippy
           args: --release --tests -- -D warnings
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-latest'
       - name: "Run formatting check"
         uses: actions-rs/cargo@v1
         with:
           command: fmt
           args: -- --check
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-latest'
 
   build:
     name: "Build/Test"
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-latest]
         toolchain: [nightly, stable]
         # include:
         #   - os: windows-latest
@@ -125,13 +120,13 @@ jobs:
       - name: Install packages from apt
         run: |
           sudo apt update
-          sudo apt install libgtk-3-dev libssh2-1-dev libglib2.0-dev libgraphene-1.0-dev libcairo-gobject2 libcairo2-dev
-        if: matrix.os == 'ubuntu-20.04'
+          sudo apt install libgtk-4-dev libssh2-1-dev libglib2.0-dev libgraphene-1.0-dev libcairo-gobject2 libcairo2-dev
+        if: matrix.os == 'ubuntu-latest'
       - name: Install toolchain packages with pacman
         run: pacman --noconfirm -S base-devel mingw-w64-${{ matrix.arch }}-toolchain
         if: matrix.os == 'windows-latest'
       - name: Install library devel packages with pacman
-        run: pacman --noconfirm -S mingw-w64-${{ matrix.arch }}-gtk3 mingw-w64-${{ matrix.arch }}-libgit2
+        run: pacman --noconfirm -S mingw-w64-${{ matrix.arch }}-libgit2
         if: matrix.os == 'windows-latest'
       - name: "Acquire gir-files"
         uses: actions/checkout@v4
@@ -149,38 +144,31 @@ jobs:
         with:
           command: test
           args: --release
-      - name: "Test (tests/sys)"
-        run: tests/sys/test.sh
-      - name: "sys_build (Windows)"
-        run: |
-          cd tests/sys/sys_build
-          cargo build && cargo build --features v3_20
-        if: matrix.os == 'windows-latest'
-      - name: "Acquire gtk3-rs"
+      - name: "Acquire gtk4-rs"
         uses: actions/checkout@v4
         with:
-          repository: gtk-rs/gtk3-rs
+          repository: gtk-rs/gtk4-rs
           ref: master
-          path: gtk3-rs
-        if: matrix.os == 'ubuntu-20.04'
-      - name: "Symlink `gir` in gtk3-rs"
+          path: gtk4-rs
+        if: matrix.os == 'ubuntu-latest'
+      - name: "Symlink `gir` in gtk4-rs"
         run: |
-          rmdir gtk3-rs/gir
-          ln -sf .. gtk3-rs/gir
-      - name: "Attempt to rebuild gtk3-rs gir"
-        run: cd gtk3-rs && python3 generator.py --no-fmt --gir-path ../target/release/gir --gir-files-directories ../tests/gir-files/ && rm ../Cargo.* && cargo build
-        if: matrix.os == 'ubuntu-20.04'
+          rmdir gtk4-rs/gir
+          ln -sf .. gtk4-rs/gir
+      - name: "Attempt to rebuild gtk4-rs gir"
+        run: cd gtk4-rs && python3 generator.py --no-fmt --gir-path ../target/release/gir --gir-files-directories ../tests/gir-files/ && rm ../Cargo.* && cargo build
+        if: matrix.os == 'ubuntu-latest'
       - name: "Acquire gtk-rs-core"
         uses: actions/checkout@v4
         with:
           repository: gtk-rs/gtk-rs-core
           ref: master
           path: gtk-rs-core
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-latest'
       - name: "Symlink `gir` in gtk-rs-core"
         run: |
           rmdir gtk-rs-core/gir
           ln -sf .. gtk-rs-core/gir
       - name: "Rebuild gio"
         run: cd gtk-rs-core/gio && cargo test
-        if: matrix.os == 'ubuntu-20.04'
+        if: matrix.os == 'ubuntu-latest'
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,4 @@
 target
-/gio
-/gtk
 /src/gir_version.rs
 /.vscode
-tests/gir-files
-tests/sys/*-sys/**
-tests/sys/sys_build/Cargo.lock
-!tests/sys/*-sys/Cargo.toml
 **.DS_Store
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tests/sys/atk-sys/Cargo.toml b/tests/sys/atk-sys/Cargo.toml
diff --git a/tests/sys/gdk-pixbuf-sys/Cargo.toml b/tests/sys/gdk-pixbuf-sys/Cargo.toml
diff --git a/tests/sys/gdk-sys/Cargo.toml b/tests/sys/gdk-sys/Cargo.toml
diff --git a/tests/sys/gio-sys/Cargo.toml b/tests/sys/gio-sys/Cargo.toml
diff --git a/tests/sys/gir-atk.toml b/tests/sys/gir-atk.toml
diff --git a/tests/sys/gir-gdk-pixbuf.toml b/tests/sys/gir-gdk-pixbuf.toml
diff --git a/tests/sys/gir-gdk.toml b/tests/sys/gir-gdk.toml
diff --git a/tests/sys/gir-gio.toml b/tests/sys/gir-gio.toml
diff --git a/tests/sys/gir-glib.toml b/tests/sys/gir-glib.toml
diff --git a/tests/sys/gir-gobject.toml b/tests/sys/gir-gobject.toml
diff --git a/tests/sys/gir-gtk.toml b/tests/sys/gir-gtk.toml
diff --git a/tests/sys/gir-pango.toml b/tests/sys/gir-pango.toml
diff --git a/tests/sys/glib-sys/Cargo.toml b/tests/sys/glib-sys/Cargo.toml
diff --git a/tests/sys/gobject-sys/Cargo.toml b/tests/sys/gobject-sys/Cargo.toml
diff --git a/tests/sys/gtk-sys/Cargo.toml b/tests/sys/gtk-sys/Cargo.toml
diff --git a/tests/sys/pango-sys/Cargo.toml b/tests/sys/pango-sys/Cargo.toml
diff --git a/tests/sys/sys_build/Cargo.toml b/tests/sys/sys_build/Cargo.toml
diff --git a/tests/sys/sys_build/src/main.rs b/tests/sys/sys_build/src/main.rs
diff --git a/tests/sys/test.sh b/tests/sys/test.sh
diff --git a/src/analysis/conversion_type.rs b/src/analysis/conversion_type.rs
    Scalar,
    /// Type implementing TryFromGlib<Error=GlibNoneError>.
    Option,
    /// Type implementing TryFromGlib<Err> where Err is neither GlibNoneError
    /// nor GlibNoneOrInvalidError. Embeds the Error type name.
    /// Defaults to the object's type for the `Ok` variant if `ok_type` is
    /// `None`.
diff --git a/src/analysis/trampolines.rs b/src/analysis/trampolines.rs
    pub user_data_index: usize,
    pub destroy_index: usize,
    pub nullable: library::Nullable,
    /// This field is used to give the type name when generating the "IsA<X>"
    /// part.
    pub type_name: String,
 }
	Scalar,
	/// Type implementing TryFromGlib<Error=GlibNoneError>.
	Option,
	/// Type implementing TryFromGlib<Err> where Err is neither GlibNoneError
Check warning on line 13 in src/analysis/conversion_type.rs GitHub Actions / build-deploy unclosed HTML tag `Err`
	/// nor GlibNoneOrInvalidError. Embeds the Error type name.
	/// Defaults to the object's type for the `Ok` variant if `ok_type` is
	/// `None`.
	pub user_data_index: usize,
	pub destroy_index: usize,
	pub nullable: library::Nullable,
	/// This field is used to give the type name when generating the "IsA<X>"
Check warning on line 41 in src/analysis/trampolines.rs GitHub Actions / build-deploy unclosed HTML tag `X`
	/// part.
	pub type_name: String,
	}