diff --git a/.github/workflows/kivy_ios.yml b/.github/workflows/kivy_ios.yml index cb8edf6..e995b99 100644 --- a/.github/workflows/kivy_ios.yml +++ b/.github/workflows/kivy_ios.yml @@ -69,6 +69,15 @@ jobs: run: | . venv/bin/activate python toolchain.py build python3 kivy + - name: Checkout kivy for tests apps + uses: actions/checkout@v2 + with: + repository: kivy/kivy + path: kivy-ci-clone + - name: Create & Build test project + run: | + . venv/bin/activate + .ci/test_project.sh build_updated_recipes: needs: flake8 diff --git a/kivy_ios/toolchain.py b/kivy_ios/toolchain.py index 7628773..e80929d 100755 --- a/kivy_ios/toolchain.py +++ b/kivy_ios/toolchain.py @@ -1397,7 +1397,6 @@ pip Install a pip dependency into the distribution "title": args.name, "project_name": args.name.lower(), "domain_name": "org.kivy.{}".format(args.name.lower()), - "kivy_dir": dirname(dirname(realpath(__file__))), "project_dir": realpath(args.directory), "version": "1.0.0", "dist_dir": ctx.dist_dir, diff --git a/kivy_ios/tools/templates/cookiecutter.json b/kivy_ios/tools/templates/cookiecutter.json index 743cb52..798b943 100644 --- a/kivy_ios/tools/templates/cookiecutter.json +++ b/kivy_ios/tools/templates/cookiecutter.json @@ -2,7 +2,6 @@ "title": "", "project_name": "", "domain_name": "", - "kivy_dir": "", "project_dir": "", "version": "1.0.0", "dist_dir": "" diff --git a/kivy_ios/tools/templates/{{ cookiecutter.project_name }}-ios/main.m b/kivy_ios/tools/templates/{{ cookiecutter.project_name }}-ios/main.m index 0c032a4..d202544 100644 --- a/kivy_ios/tools/templates/{{ cookiecutter.project_name }}-ios/main.m +++ b/kivy_ios/tools/templates/{{ cookiecutter.project_name }}-ios/main.m @@ -6,7 +6,7 @@ #import #import #include "Python.h" -#include "{{ cookiecutter.kivy_dir }}/dist/include/common/sdl2/SDL_main.h" +#include "{{ cookiecutter.dist_dir }}/include/common/sdl2/SDL_main.h" #include void export_orientation(); diff --git a/setup.py b/setup.py index 28e105a..d0265f7 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ def recursive_include(module): setup( name="kivy-ios", - version="1.1.1", + version="1.1.1.dev0", description="Kivy for iOS", long_description=read("README.md"), long_description_content_type="text/markdown",