Merge pull request #312 from mwilck/GNOME-3.32

GNOME 3.32 support Many thanks to Ernestas Kulik <[email protected]> for figuring out the necessary changes to make the hamster shell extension work under GNOME 3.32, and writing most of the code that went into this PR. Some mostly trivial additions by myself.
projecthamster · Apr 28, 2020 · 0cd48ff · 0cd48ff
2 parents 9e0a192 + ff007b3
commit 0cd48ff
Show file tree

Hide file tree

Showing 12 changed files with 284 additions and 312 deletions.
diff --git a/.jshint.cfg b/.jshint.cfg
@@ -1,3 +1,4 @@
 {
-  "moz": true
+  "moz": true,
+  "esversion": 6
 }
diff --git a/Makefile b/Makefile
@@ -55,10 +55,7 @@ clean-test-docs:
 $(BUILDDIR):
 	mkdir -p $@
 
-$(BUILDDIR)/convenience.js:	$(BUILDDIR)
-	wget https://gitlab.gnome.org/GNOME/gnome-shell-extensions/raw/gnome-3-30/lib/convenience.js -O $@
-
-collect:	$(BUILDDIR)/convenience.js
+collect:
 	cp -R extension/* $(BUILDDIR)
 	cp -R data/* $(BUILDDIR)
 

diff --git a/README.rst b/README.rst
@@ -30,10 +30,11 @@ hamster`` which should bring up ``hamster-service`` and
 ``hamster-windows-service``.
 
 Install For Production
-~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~
 The extension is available on `the central extension repository <https://extensions.gnome.org/extension/425/project-hamster-extension>`_.
 
-Current compatible Gnome shell version: 3.30
+Current compatible Gnome shell version: 3.32. *This version is not compatible
+with Gnome shell 3.30 and earlier.*
 For previous shell versions check `releases <https://github.com/projecthamster/hamster-shell-extension/tags>`_.
 
 Creating a development environment

diff --git a/data/metadata.json b/data/metadata.json
@@ -10,17 +10,7 @@
     "gettext-domain": "hamster-shell-extension",
     "settings-schema": "org.gnome.shell.extensions.project-hamster",
     "shell-version": [
-        "3.10",
-        "3.12",
-        "3.14",
-        "3.16",
-        "3.18",
-        "3.20",
-        "3.22",
-        "3.24",
-        "3.26",
-        "3.28",
-        "3.30"
+        "3.32"
     ],
     "url": "https://github.com/projecthamster/hamster-shell-extension.git",
     "uuid": "[email protected]"

diff --git a/docs/styleguide.rst b/docs/styleguide.rst
@@ -31,7 +31,7 @@ Code-style
 
 Documentation
 ---------------
-- We use `JSDoc syntax and blog tags <http://usejsdoc.org>`_ to document all
+- We use JSDoc syntax and blog tags to document all
   our code.
 - Headings should capitalise each word.
 - Please use ``-`` for unordered lists and ``#.`` for ordered lists unless you