[jnigen] Move stub package to its own folder (https://github.com/dart-lang/jnigen/issues/2)
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index 6052b06..b4cae73 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml
@@ -19,8 +19,11 @@ jobs: # Check code formatting and static analysis on a single OS (linux) # against Dart stable. - analyze: + analyze_jni_gen: runs-on: ubuntu-latest + defaults: + run: + working-directory: ./pkgs/jni_gen strategy: fail-fast: false matrix: @@ -40,9 +43,12 @@ run: dart analyze --fatal-infos if: always() && steps.install.outcome == 'success' - test: - needs: analyze + test_jni_gen: + needs: analyze_jni_gen runs-on: ${{ matrix.os }} + defaults: + run: + working-directory: ./pkgs/jni_gen strategy: fail-fast: false matrix: @@ -58,10 +64,12 @@ run: dart pub get - name: Run VM tests run: dart test --platform vm + - name: Install coverage + run: dart pub global activate coverage - name: Collect coverage - run: ./tool/coverage.sh + run: dart pub global run coverage:test_with_coverage - name: Upload coverage uses: coverallsapp/github-action@v1.1.2 with: github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: lcov.info + path-to-lcov: ./pkgs/jni_gen/coverage/lcov.info
diff --git a/pkgs/.gitignore b/pkgs/jni_gen/.gitignore similarity index 100% rename from pkgs/.gitignore rename to pkgs/jni_gen/.gitignore
diff --git a/pkgs/jni_gen/AUTHORS b/pkgs/jni_gen/AUTHORS new file mode 100644 index 0000000..846e4a1 --- /dev/null +++ b/pkgs/jni_gen/AUTHORS
@@ -0,0 +1,6 @@ +# Below is a list of people and organizations that have contributed +# to the Dart project. Names should be added to the list like so: +# +# Name/Organization <email address> + +Google LLC
diff --git a/pkgs/jni_gen/CONTRIBUTING.md b/pkgs/jni_gen/CONTRIBUTING.md new file mode 100644 index 0000000..5dadc74 --- /dev/null +++ b/pkgs/jni_gen/CONTRIBUTING.md
@@ -0,0 +1,29 @@ +# How to Contribute + +We'd love to accept your patches and contributions to this project. There are +just a few small guidelines you need to follow. + +## Contributor License Agreement + +Contributions to this project must be accompanied by a Contributor License +Agreement. You (or your employer) retain the copyright to your contribution; +this simply gives us permission to use and redistribute your contributions as +part of the project. Head over to <https://cla.developers.google.com/> to see +your current agreements on file or to sign a new one. + +You generally only need to submit a CLA once, so if you've already submitted one +(even if it was for a different project), you probably don't need to do it +again. + +## Code reviews + +All submissions, including submissions by project members, require review. We +use GitHub pull requests for this purpose. Consult +[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more +information on using pull requests. + +## Community Guidelines + +This project follows [Google's Open Source Community +Guidelines](https://opensource.google/conduct/) and the [Dart code of +conduct](https://dart.dev/code-of-conduct).
diff --git a/pkgs/jni_gen/LICENSE b/pkgs/jni_gen/LICENSE new file mode 100644 index 0000000..33474aa --- /dev/null +++ b/pkgs/jni_gen/LICENSE
@@ -0,0 +1,27 @@ +Copyright 2022, the Dart project authors. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of Google LLC nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/pkgs/jni_gen/README.md b/pkgs/jni_gen/README.md new file mode 100644 index 0000000..6aa3417 --- /dev/null +++ b/pkgs/jni_gen/README.md
@@ -0,0 +1,8 @@ +[](https://github.com/dart-lang/jni_gen/actions?query=workflow%3A%22Dart+CI%22+branch%3Amain) + +# Experimental generator for FFI+JNI bindings. + +This package will generate JNI code to invoke Java from C, and Dart FFI bindings to invoke this C code. +This enables calling Java code from Dart. + +This is a GSoC 2022 project.
diff --git a/pkgs/analysis_options.yaml b/pkgs/jni_gen/analysis_options.yaml similarity index 100% rename from pkgs/analysis_options.yaml rename to pkgs/jni_gen/analysis_options.yaml
diff --git a/pkgs/lib/jnigen.dart b/pkgs/jni_gen/lib/jni_gen.dart similarity index 100% rename from pkgs/lib/jnigen.dart rename to pkgs/jni_gen/lib/jni_gen.dart
diff --git a/pkgs/lib/src/my_sum.dart b/pkgs/jni_gen/lib/src/my_sum.dart similarity index 100% rename from pkgs/lib/src/my_sum.dart rename to pkgs/jni_gen/lib/src/my_sum.dart
diff --git a/pkgs/pubspec.yaml b/pkgs/jni_gen/pubspec.yaml similarity index 86% rename from pkgs/pubspec.yaml rename to pkgs/jni_gen/pubspec.yaml index a649b6a..f60652b 100644 --- a/pkgs/pubspec.yaml +++ b/pkgs/jni_gen/pubspec.yaml
@@ -2,9 +2,9 @@ # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. -name: jnigen +name: jni_gen version: 0.0.1 -homepage: https://github.com/google/jnigen.dart +homepage: https://github.com/dart-lang/jni_gen description: Experimental generator for FFI+JNI bindings. environment:
diff --git a/pkgs/test/my_test.dart b/pkgs/jni_gen/test/my_test.dart similarity index 89% rename from pkgs/test/my_test.dart rename to pkgs/jni_gen/test/my_test.dart index bcf2b68..647cfd3 100644 --- a/pkgs/test/my_test.dart +++ b/pkgs/jni_gen/test/my_test.dart
@@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:test/test.dart'; -import 'package:jnigen/jnigen.dart'; +import 'package:jni_gen/jni_gen.dart'; void main() { test('dummy test', () {
diff --git a/pkgs/jnigen/README.md b/pkgs/jnigen/README.md deleted file mode 100644 index c8b9f3e..0000000 --- a/pkgs/jnigen/README.md +++ /dev/null
@@ -1,8 +0,0 @@ -[](https://github.com/dart-lang/jnigen/actions?query=workflow%3A%22Dart+CI%22+branch%3Amain) - -# Experimental generator for FFI+JNI bindings. - -This package will generate JNI code to invoke Java from C, and Dart FFI bindings to invoke this C code. -This enables calling Java code from Dart. - -This is a GSoC 2022 project.
diff --git a/pkgs/tool/coverage.sh b/pkgs/tool/coverage.sh deleted file mode 100755 index 24fbaf2..0000000 --- a/pkgs/tool/coverage.sh +++ /dev/null
@@ -1,15 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file -# for details. All rights reserved. Use of this source code is governed by a -# BSD-style license that can be found in the LICENSE file. - -# Fast fail the script on failures. -set -e - -# Gather coverage. -dart pub global activate coverage -# Generate coverage report. -dart run --pause-isolates-on-exit --disable-service-auth-codes --enable-vm-service=3000 test & -dart pub global run coverage:collect_coverage --wait-paused --uri=http://127.0.0.1:3000/ -o coverage.json --resume-isolates --scope-output=jnigen -dart pub global run coverage:format_coverage --packages=.dart_tool/package_config.json --lcov -i coverage.json -o lcov.info