Merge branch 'master' of ssh://github.com/kivy/buildozer

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016 Kivy Team and other contributors
+Copyright (c) 2010-2017 Kivy Team and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

buildozer/target.py

@@ -1,4 +1,5 @@
 from sys import exit
+import os
 
 
 def no_config(f):

buildozer/targets/android.py

@@ -769,7 +769,7 @@ class TargetAndroid(Target):
             mode = 'debug'
         else:
             build_cmd += [("release", )]
-            mode = 'release'
+            mode = 'release-unsigned'
 
         self.execute_build_package(build_cmd)
 
@@ -853,11 +853,12 @@ class TargetAndroid(Target):
 
         # recreate the project.properties
         with io.open(project_fn, 'w', encoding='utf-8') as fd:
+
             try:
-                fd.writelines((line.encode('utf-8') for line in content))
+                fd.writelines((line.decode('utf-8') for line in content))
             except:
                 fd.writelines(content)
-            if not content[-1].endswith(u'\n'):
+            if content and not content[-1].endswith(u'\n'):
                 fd.write(u'\n')
             for index, ref in enumerate(references):
                 fd.write(u'android.library.reference.{}={}\n'.format(index + 1, ref))

buildozer/targets/osx.py

@@ -58,30 +58,17 @@ class TargetOSX(Target):
                 'Kivy.app'), cwd=cwd)
 
         else:
-            if not exists(join(cwd, 'Kivy{}.7z'.format(py_branch))):
+            if not exists(join(cwd, 'Kivy{}.dmg'.format(py_branch))):
                 self.buildozer.info('Downloading kivy...')
                 check_call(
-                    ('curl', '-L', '-o', 'Kivy{}.7z'.format(py_branch),
-                    'http://kivy.org/downloads/{}/Kivy-{}-osx-python{}.7z'\
+                    ('curl', '-L', '-o', 'Kivy{}.dmg'.format(py_branch),
+                    'http://kivy.org/downloads/{}/Kivy-{}-osx-python{}.dmg'\
                     .format(current_kivy_vers, current_kivy_vers, py_branch)),
                     cwd=cwd)
 
-            if not exists(join(cwd, 'Keka.app')):
-                self.buildozer.info(
-                    'Downloading Keka as dependency (to install Kivy)')
-                check_call(
-                    ('curl', '-O', 'http://www.kekaosx.com/release/Keka-1.0.8.dmg'),
-                    cwd=cwd)
-                check_call(('hdiutil', 'attach', 'Keka-1.0.8.dmg'), cwd=cwd)
-                check_call(('cp', '-a','/Volumes/Keka/Keka.app', './Keka.app'), cwd=cwd)
-                check_call(('hdiutil', 'detach', '/Volumes/Keka'))
-
             self.buildozer.info('Extracting and installing Kivy...')
-            check_call(
-                (join(cwd, 'Keka.app/Contents/MacOS/Keka'),
-                join(cwd, 'Kivy{}.7z').format(py_branch)), cwd=cwd)
-            check_call(('rm', 'Kivy{}.7z'.format(py_branch)), cwd=cwd)
-            check_call(('mv', 'Kivy{}.app'.format(py_branch), 'Kivy.app'),cwd=cwd)
+            check_call(('hdiutil', 'attach', cwd + '/Kivy{}.dmg'.format(py_branch)))
+            check_call(('cp', '-a', '/Volumes/Kivy/Kivy.app', './Kivy.app'), cwd=cwd)
 
     def ensure_kivyapp(self):
         self.buildozer.info('check if Kivy.app exists in local dir')

docs/source/specifications.rst

@@ -10,7 +10,7 @@ Section [app]
 - `title`: String, title of your application.
   
   It might be possible that some characters are not working depending on the
-  targeted paltform. It's best to try and see if everything works as expected.
+  targeted platform. It's best to try and see if everything works as expected.
   Try to avoid too long titles, as they will also not fit in the title
   displayed under the icon.
 
@@ -32,14 +32,14 @@ Section [app]
   The location must be a directory that contains a `main.py` file. It defaults
   to the directory where `buildozer.spec` is.
 
-- `source.include_exts`: List, files' extensions to include.
+- `source.include_exts`: List, file extensions to include.
 
   By default, not all files in your `source.dir` are included, but only some
   of them (`py,png,jpg,kv,atlas`), depending on the extension. Feel free to
   add your own extensions, or use an empty value if you want to include
   everything.
 
-- `source.exclude_exts`: List, files' extensions to exclude.
+- `source.exclude_exts`: List, file extensions to exclude.
 
   In contrary to `source.include_exts`, you could include all the files you
   want except the ones that end with an extension listed in this token. If
@@ -115,7 +115,7 @@ Section [app]
   have different requirements depending the platform. Currently, Buildozer
   works well only with Android, iOS support is not great on this.
 
-  The image must be a JPG or PNG, preferable with Power-of-two size. Ie, an
+  The image must be a JPG or PNG, preferable with Power-of-two size, e.g., a
   512x512 image is perfect to target all the devices. The image is not fitted,
   scaled, or anything on the device. If you provide a too-large image, it might
   not fit on small screens.