From 68f40465a007f457daffb42fabda3b595c0886b4 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 14:30:33 +0000 Subject: Initial commit with boilerplate --- app/assets/javascripts/projects/project_new.js | 8 ++++++++ lib/gitlab/project_template.rb | 3 +++ spec/lib/gitlab/project_template_spec.rb | 2 ++ 3 files changed, 13 insertions(+) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index d65e73a3f9c..bdc78c5ae38 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -121,6 +121,14 @@ const bindEvents = () => { text: 'NodeJS Express', icon: '.template-option .icon-express', }, + ios-swift: { + text: 'iOS', + icon: '.template-option svg.icon-ios-swift', + }, + android: { + text: 'Android', + icon: '.template-option svg.icon-android', + }, spring: { text: 'Spring', icon: '.template-option .icon-spring', diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index ef656e5b2ce..510afb6053c 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,6 +28,9 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), + ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 1cc2bde50e9..0f276aac52a 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,6 +7,8 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), + described_class.new('ios-swift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 0525fe497d6ddc894427bc1f6759483f5b1ac309 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 14:31:20 +0000 Subject: Specific iOS (Swift) --- app/assets/javascripts/projects/project_new.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index bdc78c5ae38..babe8575a55 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -122,7 +122,7 @@ const bindEvents = () => { icon: '.template-option .icon-express', }, ios-swift: { - text: 'iOS', + text: 'iOS (Swift)', icon: '.template-option svg.icon-ios-swift', }, android: { -- cgit v1.2.1 From 13774b49f8d662ab0658670e2a8e8a3c79d41f9c Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 17:02:56 +0000 Subject: Remove duplicate hugo --- lib/gitlab/project_template.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 510afb6053c..351f23741a4 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -31,7 +31,6 @@ module Gitlab ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), - ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), ProjectTemplate.new('gitbook', 'Pages/GitBook', _('Everything you need to create a GitLab Pages site using GitBook.'), 'https://gitlab.com/pages/gitbook'), -- cgit v1.2.1 From 2093041a20d728f898f19c1f66208de8eba5a800 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Fri, 15 Feb 2019 08:43:32 +0000 Subject: Remove dash from template name --- app/assets/javascripts/projects/project_new.js | 4 ++-- lib/gitlab/project_template.rb | 2 +- spec/lib/gitlab/project_template_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index babe8575a55..457f1b6a6c5 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -121,9 +121,9 @@ const bindEvents = () => { text: 'NodeJS Express', icon: '.template-option .icon-express', }, - ios-swift: { + iosswift: { text: 'iOS (Swift)', - icon: '.template-option svg.icon-ios-swift', + icon: '.template-option svg.icon-iosswift', }, android: { text: 'Android', diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 351f23741a4..e6135602f8f 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,7 +28,7 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 0f276aac52a..e17fcccc339 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,7 +7,7 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), - described_class.new('ios-swift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), -- cgit v1.2.1 From b8d088296b885988369826a79c4159055290267c Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 09:56:24 +0000 Subject: Delete Android.gitlab-ci.yml since we are replacing it with full template --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 --------------------------- 1 file changed, 47 deletions(-) delete mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml deleted file mode 100644 index c169e3f7686..00000000000 --- a/lib/gitlab/ci/templates/Android.gitlab-ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny -# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. - -image: openjdk:8-jdk - -variables: - ANDROID_COMPILE_SDK: "28" - ANDROID_BUILD_TOOLS: "28.0.2" - ANDROID_SDK_TOOLS: "4333796" - -before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip - - unzip -d android-sdk-linux android-sdk.zip - - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - # temporarily disable checking for EPIPE error and use yes to accept all licenses - - set +o pipefail - - yes | android-sdk-linux/tools/bin/sdkmanager --licenses - - set -o pipefail - -stages: - - build - - test - -lintDebug: - stage: build - script: - - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint - -assembleDebug: - stage: build - script: - - ./gradlew assembleDebug - artifacts: - paths: - - app/build/outputs/ - -debugTests: - stage: test - script: - - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From d7d15c53824e0d15f69cc91df982c60a91b240e9 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 11:45:49 +0100 Subject: Add initial templates --- vendor/project_templates/android.tar.gz | Bin 0 -> 131447 bytes vendor/project_templates/iosswift.tar.gz | Bin 0 -> 131447 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 vendor/project_templates/android.tar.gz create mode 100644 vendor/project_templates/iosswift.tar.gz diff --git a/vendor/project_templates/android.tar.gz b/vendor/project_templates/android.tar.gz new file mode 100644 index 00000000000..9e408235fa4 Binary files /dev/null and b/vendor/project_templates/android.tar.gz differ diff --git a/vendor/project_templates/iosswift.tar.gz b/vendor/project_templates/iosswift.tar.gz new file mode 100644 index 00000000000..9e408235fa4 Binary files /dev/null and b/vendor/project_templates/iosswift.tar.gz differ -- cgit v1.2.1 From 19f7df2c8e041093b30ea747665461809570f04a Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 11:57:20 +0100 Subject: Add changelog with MR info --- changelogs/unreleased/jlenny-mobiletemplates.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/jlenny-mobiletemplates.yml diff --git a/changelogs/unreleased/jlenny-mobiletemplates.yml b/changelogs/unreleased/jlenny-mobiletemplates.yml new file mode 100644 index 00000000000..d87bd33862a --- /dev/null +++ b/changelogs/unreleased/jlenny-mobiletemplates.yml @@ -0,0 +1,5 @@ +--- +title: Add new project templates for iOS and Android +merge_request: 25247 +author: +type: changed -- cgit v1.2.1 From 0def0b5ab1ceea2f3276ea125d666ddbdca0ce5b Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 09:56:24 +0000 Subject: Delete Android ci.yml template --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 --------------------------- 1 file changed, 47 deletions(-) delete mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml deleted file mode 100644 index c169e3f7686..00000000000 --- a/lib/gitlab/ci/templates/Android.gitlab-ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny -# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. - -image: openjdk:8-jdk - -variables: - ANDROID_COMPILE_SDK: "28" - ANDROID_BUILD_TOOLS: "28.0.2" - ANDROID_SDK_TOOLS: "4333796" - -before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip - - unzip -d android-sdk-linux android-sdk.zip - - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - # temporarily disable checking for EPIPE error and use yes to accept all licenses - - set +o pipefail - - yes | android-sdk-linux/tools/bin/sdkmanager --licenses - - set -o pipefail - -stages: - - build - - test - -lintDebug: - stage: build - script: - - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint - -assembleDebug: - stage: build - script: - - ./gradlew assembleDebug - artifacts: - paths: - - app/build/outputs/ - -debugTests: - stage: test - script: - - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From 4719917ef798871d6fc92d808d1f15a0e5c575ff Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 11:45:49 +0100 Subject: Add initial templates --- vendor/project_templates/android.tar.gz | Bin 0 -> 131447 bytes vendor/project_templates/iosswift.tar.gz | Bin 0 -> 131447 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 vendor/project_templates/android.tar.gz create mode 100644 vendor/project_templates/iosswift.tar.gz diff --git a/vendor/project_templates/android.tar.gz b/vendor/project_templates/android.tar.gz new file mode 100644 index 00000000000..9e408235fa4 Binary files /dev/null and b/vendor/project_templates/android.tar.gz differ diff --git a/vendor/project_templates/iosswift.tar.gz b/vendor/project_templates/iosswift.tar.gz new file mode 100644 index 00000000000..9e408235fa4 Binary files /dev/null and b/vendor/project_templates/iosswift.tar.gz differ -- cgit v1.2.1 From 535beaf2d15e70397824b0cddb7178131dbcfb9b Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 11:57:20 +0100 Subject: Add changelog with MR info --- changelogs/unreleased/jlenny-mobiletemplates.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/jlenny-mobiletemplates.yml diff --git a/changelogs/unreleased/jlenny-mobiletemplates.yml b/changelogs/unreleased/jlenny-mobiletemplates.yml new file mode 100644 index 00000000000..d87bd33862a --- /dev/null +++ b/changelogs/unreleased/jlenny-mobiletemplates.yml @@ -0,0 +1,5 @@ +--- +title: Add new project templates for iOS and Android +merge_request: 25247 +author: +type: changed -- cgit v1.2.1 From 994faeb47238b64648365878bc313349aed6504f Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Mon, 18 Feb 2019 01:40:26 +0000 Subject: Add localizable strings --- locale/gitlab.pot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 7cbba0779f7..93821445715 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -300,6 +300,12 @@ msgstr "" msgid "A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}." msgstr "" +msgid "A ready-to-go Android app." +msgstr "" + +msgid "A ready-to-go iOS Swift app." +msgstr "" + msgid "A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable" msgstr "" -- cgit v1.2.1 From 320e88ea4a5af30d855cda33b64c6fb177357402 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 12:14:21 +0000 Subject: Revert "Delete Android ci.yml template" This reverts commit 0def0b5ab1ceea2f3276ea125d666ddbdca0ce5b --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml new file mode 100644 index 00000000000..c169e3f7686 --- /dev/null +++ b/lib/gitlab/ci/templates/Android.gitlab-ci.yml @@ -0,0 +1,47 @@ +# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny +# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. + +image: openjdk:8-jdk + +variables: + ANDROID_COMPILE_SDK: "28" + ANDROID_BUILD_TOOLS: "28.0.2" + ANDROID_SDK_TOOLS: "4333796" + +before_script: + - apt-get --quiet update --yes + - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 + - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip + - unzip -d android-sdk-linux android-sdk.zip + - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null + - export ANDROID_HOME=$PWD/android-sdk-linux + - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ + - chmod +x ./gradlew + # temporarily disable checking for EPIPE error and use yes to accept all licenses + - set +o pipefail + - yes | android-sdk-linux/tools/bin/sdkmanager --licenses + - set -o pipefail + +stages: + - build + - test + +lintDebug: + stage: build + script: + - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint + +assembleDebug: + stage: build + script: + - ./gradlew assembleDebug + artifacts: + paths: + - app/build/outputs/ + +debugTests: + stage: test + script: + - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From dafdabc84da8bf948c2369f631693f47a4b9d29c Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 07:18:20 +0000 Subject: Add link to eventual template locations --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index e6135602f8f..e77297d8fbe 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,8 +28,8 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From bbe10fbc96b12b30a82ea4a160ea286278df8f3c Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 07:18:57 +0000 Subject: Add correct URLs to specs --- spec/lib/gitlab/project_template_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index e17fcccc339..7c178669a76 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,8 +7,8 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), - described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), - described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/gitlab-org/project-templates/android'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 9db40eae92e50aa7befb95d8b67f527d28ca4c29 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 10:05:07 +0000 Subject: Add Android and iOS logos --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index e77297d8fbe..a416c9b747f 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,8 +28,8 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), 'illustrations/logos/apple.svg'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), 'illustrations/logos/android.svg'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 51f8cc176ee2e35e2e1a3c58f060d5da4ba5ca70 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 10:08:31 +0000 Subject: Make sure it's clear we're "for use with". --- spec/lib/gitlab/project_template_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 7c178669a76..88bff5770cd 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,8 +7,8 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), - described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), - described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/gitlab-org/project-templates/android'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go template for use with iOS Swift apps.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + described_class.new('android', 'Android', 'A ready-to-go template for use with Android apps.', 'https://gitlab.com/gitlab-org/project-templates/android'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From dd18c561b5d09fce8f9345ce3927f7a091191370 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 10:47:26 +0000 Subject: Correct syntax issue --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index a416c9b747f..4bc05ccb792 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,8 +28,8 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), 'illustrations/logos/apple.svg'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), 'illustrations/logos/android.svg'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go template for use with iOS Swift apps.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift', 'illustrations/logos/apple.svg'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go template for use with Android apps.'), 'https://gitlab.com/gitlab-org/project-templates/android', 'illustrations/logos/android.svg'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From c95da4b8f542ae4b5fc241fef640a0eb61a28fc4 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 14:30:33 +0000 Subject: Initial commit with boilerplate --- app/assets/javascripts/projects/project_new.js | 8 ++++++++ lib/gitlab/project_template.rb | 3 +++ spec/lib/gitlab/project_template_spec.rb | 2 ++ 3 files changed, 13 insertions(+) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index d65e73a3f9c..bdc78c5ae38 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -121,6 +121,14 @@ const bindEvents = () => { text: 'NodeJS Express', icon: '.template-option .icon-express', }, + ios-swift: { + text: 'iOS', + icon: '.template-option svg.icon-ios-swift', + }, + android: { + text: 'Android', + icon: '.template-option svg.icon-android', + }, spring: { text: 'Spring', icon: '.template-option .icon-spring', diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index ef656e5b2ce..510afb6053c 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,6 +28,9 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), + ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 1cc2bde50e9..0f276aac52a 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,6 +7,8 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), + described_class.new('ios-swift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From f8a5859814df085d0b2dd6b9b27f0cd3922ab1c9 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 14:31:20 +0000 Subject: Specific iOS (Swift) --- app/assets/javascripts/projects/project_new.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index bdc78c5ae38..babe8575a55 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -122,7 +122,7 @@ const bindEvents = () => { icon: '.template-option .icon-express', }, ios-swift: { - text: 'iOS', + text: 'iOS (Swift)', icon: '.template-option svg.icon-ios-swift', }, android: { -- cgit v1.2.1 From 693b71796b2ea86817b4a21388f825654db94675 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 17:02:56 +0000 Subject: Remove duplicate hugo --- lib/gitlab/project_template.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 510afb6053c..351f23741a4 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -31,7 +31,6 @@ module Gitlab ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), - ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), ProjectTemplate.new('gitbook', 'Pages/GitBook', _('Everything you need to create a GitLab Pages site using GitBook.'), 'https://gitlab.com/pages/gitbook'), -- cgit v1.2.1 From e6e6a60a8fca322293ba3d091cea4ef23f5a2140 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Fri, 15 Feb 2019 08:43:32 +0000 Subject: Remove dash from template name --- app/assets/javascripts/projects/project_new.js | 4 ++-- lib/gitlab/project_template.rb | 2 +- spec/lib/gitlab/project_template_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index babe8575a55..457f1b6a6c5 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -121,9 +121,9 @@ const bindEvents = () => { text: 'NodeJS Express', icon: '.template-option .icon-express', }, - ios-swift: { + iosswift: { text: 'iOS (Swift)', - icon: '.template-option svg.icon-ios-swift', + icon: '.template-option svg.icon-iosswift', }, android: { text: 'Android', diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 351f23741a4..e6135602f8f 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,7 +28,7 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 0f276aac52a..e17fcccc339 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,7 +7,7 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), - described_class.new('ios-swift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), -- cgit v1.2.1 From 6a76ecc6273315803b2cbc292e7209fd417a6f42 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 09:56:24 +0000 Subject: Delete Android.gitlab-ci.yml since we are replacing it with full template --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 --------------------------- 1 file changed, 47 deletions(-) delete mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml deleted file mode 100644 index c169e3f7686..00000000000 --- a/lib/gitlab/ci/templates/Android.gitlab-ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny -# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. - -image: openjdk:8-jdk - -variables: - ANDROID_COMPILE_SDK: "28" - ANDROID_BUILD_TOOLS: "28.0.2" - ANDROID_SDK_TOOLS: "4333796" - -before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip - - unzip -d android-sdk-linux android-sdk.zip - - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - # temporarily disable checking for EPIPE error and use yes to accept all licenses - - set +o pipefail - - yes | android-sdk-linux/tools/bin/sdkmanager --licenses - - set -o pipefail - -stages: - - build - - test - -lintDebug: - stage: build - script: - - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint - -assembleDebug: - stage: build - script: - - ./gradlew assembleDebug - artifacts: - paths: - - app/build/outputs/ - -debugTests: - stage: test - script: - - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From 0f8a63ac4f33598504100679e10df3d894741d83 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 11:45:49 +0100 Subject: Add initial templates --- vendor/project_templates/android.tar.gz | Bin 0 -> 131447 bytes vendor/project_templates/iosswift.tar.gz | Bin 0 -> 131447 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 vendor/project_templates/android.tar.gz create mode 100644 vendor/project_templates/iosswift.tar.gz diff --git a/vendor/project_templates/android.tar.gz b/vendor/project_templates/android.tar.gz new file mode 100644 index 00000000000..9e408235fa4 Binary files /dev/null and b/vendor/project_templates/android.tar.gz differ diff --git a/vendor/project_templates/iosswift.tar.gz b/vendor/project_templates/iosswift.tar.gz new file mode 100644 index 00000000000..9e408235fa4 Binary files /dev/null and b/vendor/project_templates/iosswift.tar.gz differ -- cgit v1.2.1 From 4a7d49e392d66a5f8a81bd30be7e0d5a3240e51a Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 11:57:20 +0100 Subject: Add changelog with MR info --- changelogs/unreleased/jlenny-mobiletemplates.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/jlenny-mobiletemplates.yml diff --git a/changelogs/unreleased/jlenny-mobiletemplates.yml b/changelogs/unreleased/jlenny-mobiletemplates.yml new file mode 100644 index 00000000000..d87bd33862a --- /dev/null +++ b/changelogs/unreleased/jlenny-mobiletemplates.yml @@ -0,0 +1,5 @@ +--- +title: Add new project templates for iOS and Android +merge_request: 25247 +author: +type: changed -- cgit v1.2.1 From ed44c41b25aa4a36f445531ebe9f37dcce26b0b8 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Mon, 18 Feb 2019 01:40:26 +0000 Subject: Add localizable strings --- locale/gitlab.pot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index df63e61a302..e1efe107384 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -303,6 +303,12 @@ msgstr "" msgid "A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}." msgstr "" +msgid "A ready-to-go Android app." +msgstr "" + +msgid "A ready-to-go iOS Swift app." +msgstr "" + msgid "A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable" msgstr "" -- cgit v1.2.1 From 79727d3fb0c3f28167779d337d091d6d684f16e5 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 12:14:21 +0000 Subject: Revert "Delete Android ci.yml template" This reverts commit 0def0b5ab1ceea2f3276ea125d666ddbdca0ce5b --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml new file mode 100644 index 00000000000..c169e3f7686 --- /dev/null +++ b/lib/gitlab/ci/templates/Android.gitlab-ci.yml @@ -0,0 +1,47 @@ +# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny +# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. + +image: openjdk:8-jdk + +variables: + ANDROID_COMPILE_SDK: "28" + ANDROID_BUILD_TOOLS: "28.0.2" + ANDROID_SDK_TOOLS: "4333796" + +before_script: + - apt-get --quiet update --yes + - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 + - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip + - unzip -d android-sdk-linux android-sdk.zip + - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null + - export ANDROID_HOME=$PWD/android-sdk-linux + - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ + - chmod +x ./gradlew + # temporarily disable checking for EPIPE error and use yes to accept all licenses + - set +o pipefail + - yes | android-sdk-linux/tools/bin/sdkmanager --licenses + - set -o pipefail + +stages: + - build + - test + +lintDebug: + stage: build + script: + - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint + +assembleDebug: + stage: build + script: + - ./gradlew assembleDebug + artifacts: + paths: + - app/build/outputs/ + +debugTests: + stage: test + script: + - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From 5cea94edcc9017073b08553753b34c9333d2bf37 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 07:18:20 +0000 Subject: Add link to eventual template locations --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index e6135602f8f..e77297d8fbe 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,8 +28,8 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 3d843b02e2b9518d43f420f70f1fcd9b059c7929 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 07:18:57 +0000 Subject: Add correct URLs to specs --- spec/lib/gitlab/project_template_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index e17fcccc339..7c178669a76 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,8 +7,8 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), - described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), - described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/gitlab-org/project-templates/android'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 5d4820a1ffca4e68a9b03f6726de8d896c1d38f2 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 10:05:07 +0000 Subject: Add Android and iOS logos --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index e77297d8fbe..a416c9b747f 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,8 +28,8 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), 'illustrations/logos/apple.svg'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), 'illustrations/logos/android.svg'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From f3a8870b703dc51c0991eeaf4cc6e43fea01eedb Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 10:08:31 +0000 Subject: Make sure it's clear we're "for use with". --- spec/lib/gitlab/project_template_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 7c178669a76..88bff5770cd 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,8 +7,8 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), - described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), - described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/gitlab-org/project-templates/android'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go template for use with iOS Swift apps.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + described_class.new('android', 'Android', 'A ready-to-go template for use with Android apps.', 'https://gitlab.com/gitlab-org/project-templates/android'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 8973e0670354b303724e3a87895148098522c95b Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 10:47:26 +0000 Subject: Correct syntax issue --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index a416c9b747f..4bc05ccb792 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,8 +28,8 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), 'illustrations/logos/apple.svg'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), 'illustrations/logos/android.svg'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go template for use with iOS Swift apps.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift', 'illustrations/logos/apple.svg'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go template for use with Android apps.'), 'https://gitlab.com/gitlab-org/project-templates/android', 'illustrations/logos/android.svg'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 60aa318d8774990451787ca22f040230d57e4623 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 12:09:36 +0000 Subject: Update localized strings --- locale/gitlab.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e1efe107384..8d18a710e4f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -303,10 +303,10 @@ msgstr "" msgid "A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}." msgstr "" -msgid "A ready-to-go Android app." +msgid "A ready-to-go template for use with Android apps." msgstr "" -msgid "A ready-to-go iOS Swift app." +msgid "A ready-to-go template for use with iOS Swift apps." msgstr "" msgid "A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable" -- cgit v1.2.1 From fff7d2701b3b134c6950cdf10822e54dbbab31ab Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 14:30:33 +0000 Subject: Initial commit with boilerplate --- app/assets/javascripts/projects/project_new.js | 8 ++++++++ lib/gitlab/project_template.rb | 3 +++ spec/lib/gitlab/project_template_spec.rb | 2 ++ 3 files changed, 13 insertions(+) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index d65e73a3f9c..bdc78c5ae38 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -121,6 +121,14 @@ const bindEvents = () => { text: 'NodeJS Express', icon: '.template-option .icon-express', }, + ios-swift: { + text: 'iOS', + icon: '.template-option svg.icon-ios-swift', + }, + android: { + text: 'Android', + icon: '.template-option svg.icon-android', + }, spring: { text: 'Spring', icon: '.template-option .icon-spring', diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index ef656e5b2ce..510afb6053c 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,6 +28,9 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), + ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 1cc2bde50e9..0f276aac52a 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,6 +7,8 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), + described_class.new('ios-swift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From a91643e098eef5a8568c57cb40ba25630eb9b736 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 14:31:20 +0000 Subject: Specific iOS (Swift) --- app/assets/javascripts/projects/project_new.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index bdc78c5ae38..babe8575a55 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -122,7 +122,7 @@ const bindEvents = () => { icon: '.template-option .icon-express', }, ios-swift: { - text: 'iOS', + text: 'iOS (Swift)', icon: '.template-option svg.icon-ios-swift', }, android: { -- cgit v1.2.1 From b5d520ff674d16ccdfbe860bcb42fa32f65412b8 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 17:02:56 +0000 Subject: Remove duplicate hugo --- lib/gitlab/project_template.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 510afb6053c..351f23741a4 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -31,7 +31,6 @@ module Gitlab ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), - ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), ProjectTemplate.new('gitbook', 'Pages/GitBook', _('Everything you need to create a GitLab Pages site using GitBook.'), 'https://gitlab.com/pages/gitbook'), -- cgit v1.2.1 From 9b195f5a32c50efd8fa3a30ba2a82ad9ad354764 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Fri, 15 Feb 2019 08:43:32 +0000 Subject: Remove dash from template name --- app/assets/javascripts/projects/project_new.js | 4 ++-- lib/gitlab/project_template.rb | 2 +- spec/lib/gitlab/project_template_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index babe8575a55..457f1b6a6c5 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -121,9 +121,9 @@ const bindEvents = () => { text: 'NodeJS Express', icon: '.template-option .icon-express', }, - ios-swift: { + iosswift: { text: 'iOS (Swift)', - icon: '.template-option svg.icon-ios-swift', + icon: '.template-option svg.icon-iosswift', }, android: { text: 'Android', diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 351f23741a4..e6135602f8f 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,7 +28,7 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 0f276aac52a..e17fcccc339 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,7 +7,7 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), - described_class.new('ios-swift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), -- cgit v1.2.1 From 2ce4c06995f60d36ca0d9789bfdab2d0cd674a52 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 09:56:24 +0000 Subject: Delete Android.gitlab-ci.yml since we are replacing it with full template --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 --------------------------- 1 file changed, 47 deletions(-) delete mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml deleted file mode 100644 index c169e3f7686..00000000000 --- a/lib/gitlab/ci/templates/Android.gitlab-ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny -# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. - -image: openjdk:8-jdk - -variables: - ANDROID_COMPILE_SDK: "28" - ANDROID_BUILD_TOOLS: "28.0.2" - ANDROID_SDK_TOOLS: "4333796" - -before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip - - unzip -d android-sdk-linux android-sdk.zip - - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - # temporarily disable checking for EPIPE error and use yes to accept all licenses - - set +o pipefail - - yes | android-sdk-linux/tools/bin/sdkmanager --licenses - - set -o pipefail - -stages: - - build - - test - -lintDebug: - stage: build - script: - - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint - -assembleDebug: - stage: build - script: - - ./gradlew assembleDebug - artifacts: - paths: - - app/build/outputs/ - -debugTests: - stage: test - script: - - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From 1c72ee6f3dd85a4b60a910d913245e5b2a21b83f Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 11:45:49 +0100 Subject: Add initial templates --- vendor/project_templates/android.tar.gz | Bin 0 -> 131447 bytes vendor/project_templates/iosswift.tar.gz | Bin 0 -> 131447 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 vendor/project_templates/android.tar.gz create mode 100644 vendor/project_templates/iosswift.tar.gz diff --git a/vendor/project_templates/android.tar.gz b/vendor/project_templates/android.tar.gz new file mode 100644 index 00000000000..9e408235fa4 Binary files /dev/null and b/vendor/project_templates/android.tar.gz differ diff --git a/vendor/project_templates/iosswift.tar.gz b/vendor/project_templates/iosswift.tar.gz new file mode 100644 index 00000000000..9e408235fa4 Binary files /dev/null and b/vendor/project_templates/iosswift.tar.gz differ -- cgit v1.2.1 From b639f2153019e9dc4e040373bb60dffbaedf4e07 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 11:57:20 +0100 Subject: Add changelog with MR info --- changelogs/unreleased/jlenny-mobiletemplates.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/jlenny-mobiletemplates.yml diff --git a/changelogs/unreleased/jlenny-mobiletemplates.yml b/changelogs/unreleased/jlenny-mobiletemplates.yml new file mode 100644 index 00000000000..d87bd33862a --- /dev/null +++ b/changelogs/unreleased/jlenny-mobiletemplates.yml @@ -0,0 +1,5 @@ +--- +title: Add new project templates for iOS and Android +merge_request: 25247 +author: +type: changed -- cgit v1.2.1 From f32cf61a60cfa1b4d93c7ed59f56341cf9338c3a Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Mon, 18 Feb 2019 01:40:26 +0000 Subject: Add localizable strings --- locale/gitlab.pot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 4c064b7741a..4e1bbd0479e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -303,6 +303,12 @@ msgstr "" msgid "A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}." msgstr "" +msgid "A ready-to-go Android app." +msgstr "" + +msgid "A ready-to-go iOS Swift app." +msgstr "" + msgid "A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable" msgstr "" -- cgit v1.2.1 From 50d8a518d4ac3f984e458ab37635de2705b32274 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 12:14:21 +0000 Subject: Revert "Delete Android ci.yml template" This reverts commit 0def0b5ab1ceea2f3276ea125d666ddbdca0ce5b --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml new file mode 100644 index 00000000000..c169e3f7686 --- /dev/null +++ b/lib/gitlab/ci/templates/Android.gitlab-ci.yml @@ -0,0 +1,47 @@ +# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny +# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. + +image: openjdk:8-jdk + +variables: + ANDROID_COMPILE_SDK: "28" + ANDROID_BUILD_TOOLS: "28.0.2" + ANDROID_SDK_TOOLS: "4333796" + +before_script: + - apt-get --quiet update --yes + - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 + - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip + - unzip -d android-sdk-linux android-sdk.zip + - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null + - export ANDROID_HOME=$PWD/android-sdk-linux + - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ + - chmod +x ./gradlew + # temporarily disable checking for EPIPE error and use yes to accept all licenses + - set +o pipefail + - yes | android-sdk-linux/tools/bin/sdkmanager --licenses + - set -o pipefail + +stages: + - build + - test + +lintDebug: + stage: build + script: + - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint + +assembleDebug: + stage: build + script: + - ./gradlew assembleDebug + artifacts: + paths: + - app/build/outputs/ + +debugTests: + stage: test + script: + - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From 4e68a112b417179d87037f6ccba8d514b8d27b3e Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 07:18:20 +0000 Subject: Add link to eventual template locations --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index e6135602f8f..e77297d8fbe 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,8 +28,8 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 781e95fb686dc920fdba5eb205b20d21741e4758 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 07:18:57 +0000 Subject: Add correct URLs to specs --- spec/lib/gitlab/project_template_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index e17fcccc339..7c178669a76 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,8 +7,8 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), - described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), - described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/gitlab-org/project-templates/android'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 4ff6264d17fc2576eab88009420e5e82a06ba319 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 10:05:07 +0000 Subject: Add Android and iOS logos --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index e77297d8fbe..a416c9b747f 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,8 +28,8 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), 'illustrations/logos/apple.svg'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), 'illustrations/logos/android.svg'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 593914e02e94725b37531848c488bf97f72aa48f Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 10:08:31 +0000 Subject: Make sure it's clear we're "for use with". --- spec/lib/gitlab/project_template_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 7c178669a76..88bff5770cd 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -7,8 +7,8 @@ describe Gitlab::ProjectTemplate do described_class.new('rails', 'Ruby on Rails', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/rails'), described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), - described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), - described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/gitlab-org/project-templates/android'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go template for use with iOS Swift apps.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + described_class.new('android', 'Android', 'A ready-to-go template for use with Android apps.', 'https://gitlab.com/gitlab-org/project-templates/android'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 55a5b88f03846030b448144bfc99a66e683482b6 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 10:47:26 +0000 Subject: Correct syntax issue --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index a416c9b747f..4bc05ccb792 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,8 +28,8 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), 'illustrations/logos/apple.svg'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), 'illustrations/logos/android.svg'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go template for use with iOS Swift apps.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift', 'illustrations/logos/apple.svg'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go template for use with Android apps.'), 'https://gitlab.com/gitlab-org/project-templates/android', 'illustrations/logos/android.svg'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From e747b742f6c16e2e4bc7618b41e75f490e036ad2 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 09:56:24 +0000 Subject: Delete Android.gitlab-ci.yml since we are replacing it with full template --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 --------------------------- 1 file changed, 47 deletions(-) delete mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml deleted file mode 100644 index c169e3f7686..00000000000 --- a/lib/gitlab/ci/templates/Android.gitlab-ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny -# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. - -image: openjdk:8-jdk - -variables: - ANDROID_COMPILE_SDK: "28" - ANDROID_BUILD_TOOLS: "28.0.2" - ANDROID_SDK_TOOLS: "4333796" - -before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip - - unzip -d android-sdk-linux android-sdk.zip - - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - # temporarily disable checking for EPIPE error and use yes to accept all licenses - - set +o pipefail - - yes | android-sdk-linux/tools/bin/sdkmanager --licenses - - set -o pipefail - -stages: - - build - - test - -lintDebug: - stage: build - script: - - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint - -assembleDebug: - stage: build - script: - - ./gradlew assembleDebug - artifacts: - paths: - - app/build/outputs/ - -debugTests: - stage: test - script: - - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From 0562e79a46940ca7855d7a1846c18b3bb99b6d07 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 12:14:21 +0000 Subject: Revert "Delete Android ci.yml template" This reverts commit 0def0b5ab1ceea2f3276ea125d666ddbdca0ce5b --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml new file mode 100644 index 00000000000..c169e3f7686 --- /dev/null +++ b/lib/gitlab/ci/templates/Android.gitlab-ci.yml @@ -0,0 +1,47 @@ +# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny +# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. + +image: openjdk:8-jdk + +variables: + ANDROID_COMPILE_SDK: "28" + ANDROID_BUILD_TOOLS: "28.0.2" + ANDROID_SDK_TOOLS: "4333796" + +before_script: + - apt-get --quiet update --yes + - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 + - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip + - unzip -d android-sdk-linux android-sdk.zip + - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null + - export ANDROID_HOME=$PWD/android-sdk-linux + - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ + - chmod +x ./gradlew + # temporarily disable checking for EPIPE error and use yes to accept all licenses + - set +o pipefail + - yes | android-sdk-linux/tools/bin/sdkmanager --licenses + - set -o pipefail + +stages: + - build + - test + +lintDebug: + stage: build + script: + - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint + +assembleDebug: + stage: build + script: + - ./gradlew assembleDebug + artifacts: + paths: + - app/build/outputs/ + +debugTests: + stage: test + script: + - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From 22969ef62c2e3759c40304522f5040cd47f59f01 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 12:09:36 +0000 Subject: Update localized strings --- locale/gitlab.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 4e1bbd0479e..1fa94f24bd0 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -303,10 +303,10 @@ msgstr "" msgid "A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}." msgstr "" -msgid "A ready-to-go Android app." +msgid "A ready-to-go template for use with Android apps." msgstr "" -msgid "A ready-to-go iOS Swift app." +msgid "A ready-to-go template for use with iOS Swift apps." msgstr "" msgid "A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable" -- cgit v1.2.1 From d8e745199d2f3f11a6d144a9cea39efbd5ee4998 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 17:41:24 +0100 Subject: Update archive file --- vendor/project_templates/android.tar.gz | Bin 131447 -> 131057 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/vendor/project_templates/android.tar.gz b/vendor/project_templates/android.tar.gz index 9e408235fa4..1ed4ca06ee2 100644 Binary files a/vendor/project_templates/android.tar.gz and b/vendor/project_templates/android.tar.gz differ -- cgit v1.2.1 From b0bb99bb231fa91bc4f1d36f02457644cc2ee595 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 18:04:46 +0100 Subject: Use unmodified export --- vendor/project_templates/android.tar.gz | Bin 131057 -> 158682 bytes vendor/project_templates/iosswift.tar.gz | Bin 131447 -> 158682 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/vendor/project_templates/android.tar.gz b/vendor/project_templates/android.tar.gz index 1ed4ca06ee2..457a1f05fce 100644 Binary files a/vendor/project_templates/android.tar.gz and b/vendor/project_templates/android.tar.gz differ diff --git a/vendor/project_templates/iosswift.tar.gz b/vendor/project_templates/iosswift.tar.gz index 9e408235fa4..457a1f05fce 100644 Binary files a/vendor/project_templates/iosswift.tar.gz and b/vendor/project_templates/iosswift.tar.gz differ -- cgit v1.2.1 From afe369854118201462e1b45fe5c7eddd154d390e Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Fri, 22 Feb 2019 05:54:33 +0000 Subject: Replace iOS icon with GitLab icon for legal reasons --- app/assets/javascripts/projects/project_new.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 457f1b6a6c5..a4447d7c99c 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -123,7 +123,7 @@ const bindEvents = () => { }, iosswift: { text: 'iOS (Swift)', - icon: '.template-option svg.icon-iosswift', + icon: '.template-option svg.icon-gitlab', }, android: { text: 'Android', -- cgit v1.2.1 From 52ef77f3136863edc298eb823c9b85e7fc60c1c4 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Fri, 22 Feb 2019 05:55:06 +0000 Subject: Remove Apple logo for legal reasons --- lib/gitlab/project_template.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 4bc05ccb792..360b80ab86b 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -28,7 +28,7 @@ module Gitlab ProjectTemplate.new('rails', 'Ruby on Rails', _('Includes an MVC structure, Gemfile, Rakefile, along with many others, to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/rails', 'illustrations/logos/rails.svg'), ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go template for use with iOS Swift apps.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift', 'illustrations/logos/apple.svg'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go template for use with iOS Swift apps.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), ProjectTemplate.new('android', 'Android', _('A ready-to-go template for use with Android apps.'), 'https://gitlab.com/gitlab-org/project-templates/android', 'illustrations/logos/android.svg'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), -- cgit v1.2.1 From e63a1f6cd63275236aa20c200a61089a0b6aca6f Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 14:30:33 +0000 Subject: Initial commit with boilerplate --- app/assets/javascripts/projects/project_new.js | 8 ++++++++ lib/gitlab/project_template.rb | 2 ++ spec/lib/gitlab/project_template_spec.rb | 2 ++ 3 files changed, 12 insertions(+) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 6fb25622a05..604ae79f0f5 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -121,6 +121,14 @@ const bindEvents = () => { text: 'NodeJS Express', icon: '.template-option .icon-express', }, + ios-swift: { + text: 'iOS', + icon: '.template-option svg.icon-ios-swift', + }, + android: { + text: 'Android', + icon: '.template-option svg.icon-android', + }, spring: { text: 'Spring', icon: '.template-option .icon-spring', diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 29c511524a2..c2525762cc3 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -29,6 +29,8 @@ module Gitlab ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), ProjectTemplate.new('dotnetcore', '.NET Core', _('A .NET Core console application template, customizable for any .NET Core project'), 'https://gitlab.com/gitlab-org/project-templates/dotnetcore', 'illustrations/logos/dotnet.svg'), + ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index 0cee100b64e..d33a659a7a7 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -8,6 +8,8 @@ describe Gitlab::ProjectTemplate do described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), described_class.new('dotnetcore', '.NET Core', _('A .NET Core console application template, customizable for any .NET Core project'), 'https://gitlab.com/gitlab-org/project-templates/dotnetcore'), + described_class.new('ios-swift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 34c4ff88e88cf2083cc4f5d20202a2fe8b347643 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 14:31:20 +0000 Subject: Specific iOS (Swift) --- app/assets/javascripts/projects/project_new.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 604ae79f0f5..ee910845d41 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -122,7 +122,7 @@ const bindEvents = () => { icon: '.template-option .icon-express', }, ios-swift: { - text: 'iOS', + text: 'iOS (Swift)', icon: '.template-option svg.icon-ios-swift', }, android: { -- cgit v1.2.1 From bb5297215fdd768d5e3363ab4f5d66eb806029e8 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Fri, 15 Feb 2019 08:43:32 +0000 Subject: Remove dash from template name --- app/assets/javascripts/projects/project_new.js | 4 ++-- lib/gitlab/project_template.rb | 2 +- spec/lib/gitlab/project_template_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index ee910845d41..826b3d020f6 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -121,9 +121,9 @@ const bindEvents = () => { text: 'NodeJS Express', icon: '.template-option .icon-express', }, - ios-swift: { + iosswift: { text: 'iOS (Swift)', - icon: '.template-option svg.icon-ios-swift', + icon: '.template-option svg.icon-iosswift', }, android: { text: 'Android', diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index c2525762cc3..f1bd660651f 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -29,7 +29,7 @@ module Gitlab ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), ProjectTemplate.new('dotnetcore', '.NET Core', _('A .NET Core console application template, customizable for any .NET Core project'), 'https://gitlab.com/gitlab-org/project-templates/dotnetcore', 'illustrations/logos/dotnet.svg'), - ProjectTemplate.new('ios-swift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index d33a659a7a7..eb9f531fe36 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -8,7 +8,7 @@ describe Gitlab::ProjectTemplate do described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), described_class.new('dotnetcore', '.NET Core', _('A .NET Core console application template, customizable for any .NET Core project'), 'https://gitlab.com/gitlab-org/project-templates/dotnetcore'), - described_class.new('ios-swift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), -- cgit v1.2.1 From 851f2e22d83d4aaa79fe50ef16cd03a14e42a1f0 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 09:56:24 +0000 Subject: Delete Android.gitlab-ci.yml since we are replacing it with full template --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 --------------------------- 1 file changed, 47 deletions(-) delete mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml deleted file mode 100644 index c169e3f7686..00000000000 --- a/lib/gitlab/ci/templates/Android.gitlab-ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny -# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. - -image: openjdk:8-jdk - -variables: - ANDROID_COMPILE_SDK: "28" - ANDROID_BUILD_TOOLS: "28.0.2" - ANDROID_SDK_TOOLS: "4333796" - -before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip - - unzip -d android-sdk-linux android-sdk.zip - - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - # temporarily disable checking for EPIPE error and use yes to accept all licenses - - set +o pipefail - - yes | android-sdk-linux/tools/bin/sdkmanager --licenses - - set -o pipefail - -stages: - - build - - test - -lintDebug: - stage: build - script: - - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint - -assembleDebug: - stage: build - script: - - ./gradlew assembleDebug - artifacts: - paths: - - app/build/outputs/ - -debugTests: - stage: test - script: - - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From 5885e484c7280a9d00e68ca405debb3b9921549d Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 11:45:49 +0100 Subject: Add initial templates --- vendor/project_templates/android.tar.gz | Bin 0 -> 131447 bytes vendor/project_templates/iosswift.tar.gz | Bin 0 -> 131447 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 vendor/project_templates/android.tar.gz create mode 100644 vendor/project_templates/iosswift.tar.gz diff --git a/vendor/project_templates/android.tar.gz b/vendor/project_templates/android.tar.gz new file mode 100644 index 00000000000..9e408235fa4 Binary files /dev/null and b/vendor/project_templates/android.tar.gz differ diff --git a/vendor/project_templates/iosswift.tar.gz b/vendor/project_templates/iosswift.tar.gz new file mode 100644 index 00000000000..9e408235fa4 Binary files /dev/null and b/vendor/project_templates/iosswift.tar.gz differ -- cgit v1.2.1 From 67387367fb0f1ff0b525d96535c62d307a1b4fec Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 11:57:20 +0100 Subject: Add changelog with MR info --- changelogs/unreleased/jlenny-mobiletemplates.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/jlenny-mobiletemplates.yml diff --git a/changelogs/unreleased/jlenny-mobiletemplates.yml b/changelogs/unreleased/jlenny-mobiletemplates.yml new file mode 100644 index 00000000000..d87bd33862a --- /dev/null +++ b/changelogs/unreleased/jlenny-mobiletemplates.yml @@ -0,0 +1,5 @@ +--- +title: Add new project templates for iOS and Android +merge_request: 25247 +author: +type: changed -- cgit v1.2.1 From e939976f231abc351f50a7743a11c06e7b621cc9 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Mon, 18 Feb 2019 01:40:26 +0000 Subject: Add localizable strings --- locale/gitlab.pot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index bd45b01d463..93bc7ab3a35 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -321,6 +321,12 @@ msgstr "" msgid "A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}." msgstr "" +msgid "A ready-to-go Android app." +msgstr "" + +msgid "A ready-to-go iOS Swift app." +msgstr "" + msgid "A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable" msgstr "" -- cgit v1.2.1 From 5c97a2d533a28be88eb177342101bfc2a10c37f9 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 12:14:21 +0000 Subject: Revert "Delete Android ci.yml template" This reverts commit 0def0b5ab1ceea2f3276ea125d666ddbdca0ce5b --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml new file mode 100644 index 00000000000..c169e3f7686 --- /dev/null +++ b/lib/gitlab/ci/templates/Android.gitlab-ci.yml @@ -0,0 +1,47 @@ +# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny +# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. + +image: openjdk:8-jdk + +variables: + ANDROID_COMPILE_SDK: "28" + ANDROID_BUILD_TOOLS: "28.0.2" + ANDROID_SDK_TOOLS: "4333796" + +before_script: + - apt-get --quiet update --yes + - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 + - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip + - unzip -d android-sdk-linux android-sdk.zip + - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null + - export ANDROID_HOME=$PWD/android-sdk-linux + - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ + - chmod +x ./gradlew + # temporarily disable checking for EPIPE error and use yes to accept all licenses + - set +o pipefail + - yes | android-sdk-linux/tools/bin/sdkmanager --licenses + - set -o pipefail + +stages: + - build + - test + +lintDebug: + stage: build + script: + - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint + +assembleDebug: + stage: build + script: + - ./gradlew assembleDebug + artifacts: + paths: + - app/build/outputs/ + +debugTests: + stage: test + script: + - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From be9d473e19b37ff4c219e1656d6381874f97545b Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 07:18:20 +0000 Subject: Add link to eventual template locations --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index f1bd660651f..707379be935 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -29,8 +29,8 @@ module Gitlab ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), ProjectTemplate.new('dotnetcore', '.NET Core', _('A .NET Core console application template, customizable for any .NET Core project'), 'https://gitlab.com/gitlab-org/project-templates/dotnetcore', 'illustrations/logos/dotnet.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/TO_BE_DETERMINED'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/TO_BE_DETERMINED'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 00e85063579b57d0e215d4b5564068ff8bc22d64 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 07:18:57 +0000 Subject: Add correct URLs to specs --- spec/lib/gitlab/project_template_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index eb9f531fe36..ac660eef9e0 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -8,8 +8,8 @@ describe Gitlab::ProjectTemplate do described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), described_class.new('dotnetcore', '.NET Core', _('A .NET Core console application template, customizable for any .NET Core project'), 'https://gitlab.com/gitlab-org/project-templates/dotnetcore'), - described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/TO_BE_DETERMINED'), - described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/TO_BE_DETERMINED'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/gitlab-org/project-templates/android'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 15fc8d304fcd01a9d9b33460b6e86bc97fb4a73b Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 10:05:07 +0000 Subject: Add Android and iOS logos --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 707379be935..947a5392c0a 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -29,8 +29,8 @@ module Gitlab ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), ProjectTemplate.new('dotnetcore', '.NET Core', _('A .NET Core console application template, customizable for any .NET Core project'), 'https://gitlab.com/gitlab-org/project-templates/dotnetcore', 'illustrations/logos/dotnet.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), 'illustrations/logos/apple.svg'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), 'illustrations/logos/android.svg'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From 8d536ed5a07b031bedb918a674f789c3da073a33 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 10:08:31 +0000 Subject: Make sure it's clear we're "for use with". --- spec/lib/gitlab/project_template_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/gitlab/project_template_spec.rb b/spec/lib/gitlab/project_template_spec.rb index ac660eef9e0..72209116b1f 100644 --- a/spec/lib/gitlab/project_template_spec.rb +++ b/spec/lib/gitlab/project_template_spec.rb @@ -8,8 +8,8 @@ describe Gitlab::ProjectTemplate do described_class.new('spring', 'Spring', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/spring'), described_class.new('express', 'NodeJS Express', 'Includes an MVC structure, .gitignore, Gemfile, and more great stuff', 'https://gitlab.com/gitlab-org/project-templates/express'), described_class.new('dotnetcore', '.NET Core', _('A .NET Core console application template, customizable for any .NET Core project'), 'https://gitlab.com/gitlab-org/project-templates/dotnetcore'), - described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go iOS Swift app.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), - described_class.new('android', 'Android', 'A ready-to-go Android app.', 'https://gitlab.com/gitlab-org/project-templates/android'), + described_class.new('iosswift', 'iOS (Swift)', 'A ready-to-go template for use with iOS Swift apps.', 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + described_class.new('android', 'Android', 'A ready-to-go template for use with Android apps.', 'https://gitlab.com/gitlab-org/project-templates/android'), described_class.new('hugo', 'Pages/Hugo', 'Everything you need to get started using a Hugo Pages site.', 'https://gitlab.com/pages/hugo'), described_class.new('jekyll', 'Pages/Jekyll', 'Everything you need to get started using a Jekyll Pages site.', 'https://gitlab.com/pages/jekyll'), described_class.new('plainhtml', 'Pages/Plain HTML', 'Everything you need to get started using a plain HTML Pages site.', 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1 From c4c601282c01a05e3240b2fd2a4e6cde00d898ce Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 14:31:20 +0000 Subject: Specific iOS (Swift) --- app/assets/javascripts/projects/project_new.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 826b3d020f6..b9b42be6272 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -124,7 +124,6 @@ const bindEvents = () => { iosswift: { text: 'iOS (Swift)', icon: '.template-option svg.icon-iosswift', - }, android: { text: 'Android', icon: '.template-option svg.icon-android', -- cgit v1.2.1 From c2e8f6d8b589991284815559e8c93ce9f83cd30c Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Fri, 15 Feb 2019 08:43:32 +0000 Subject: Remove dash from template name --- app/assets/javascripts/projects/project_new.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index b9b42be6272..826b3d020f6 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -124,6 +124,7 @@ const bindEvents = () => { iosswift: { text: 'iOS (Swift)', icon: '.template-option svg.icon-iosswift', + }, android: { text: 'Android', icon: '.template-option svg.icon-android', -- cgit v1.2.1 From 4750d503ac26112f5fe00464fcc56d66eadcada5 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 09:56:24 +0000 Subject: Delete Android.gitlab-ci.yml since we are replacing it with full template --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 --------------------------- 1 file changed, 47 deletions(-) delete mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml deleted file mode 100644 index c169e3f7686..00000000000 --- a/lib/gitlab/ci/templates/Android.gitlab-ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny -# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. - -image: openjdk:8-jdk - -variables: - ANDROID_COMPILE_SDK: "28" - ANDROID_BUILD_TOOLS: "28.0.2" - ANDROID_SDK_TOOLS: "4333796" - -before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip - - unzip -d android-sdk-linux android-sdk.zip - - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - # temporarily disable checking for EPIPE error and use yes to accept all licenses - - set +o pipefail - - yes | android-sdk-linux/tools/bin/sdkmanager --licenses - - set -o pipefail - -stages: - - build - - test - -lintDebug: - stage: build - script: - - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint - -assembleDebug: - stage: build - script: - - ./gradlew assembleDebug - artifacts: - paths: - - app/build/outputs/ - -debugTests: - stage: test - script: - - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From fc1181d3f2fc1ab540baeda322edc511a8fb4f40 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 12:14:21 +0000 Subject: Revert "Delete Android ci.yml template" This reverts commit 0def0b5ab1ceea2f3276ea125d666ddbdca0ce5b --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml new file mode 100644 index 00000000000..c169e3f7686 --- /dev/null +++ b/lib/gitlab/ci/templates/Android.gitlab-ci.yml @@ -0,0 +1,47 @@ +# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny +# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. + +image: openjdk:8-jdk + +variables: + ANDROID_COMPILE_SDK: "28" + ANDROID_BUILD_TOOLS: "28.0.2" + ANDROID_SDK_TOOLS: "4333796" + +before_script: + - apt-get --quiet update --yes + - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 + - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip + - unzip -d android-sdk-linux android-sdk.zip + - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null + - export ANDROID_HOME=$PWD/android-sdk-linux + - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ + - chmod +x ./gradlew + # temporarily disable checking for EPIPE error and use yes to accept all licenses + - set +o pipefail + - yes | android-sdk-linux/tools/bin/sdkmanager --licenses + - set -o pipefail + +stages: + - build + - test + +lintDebug: + stage: build + script: + - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint + +assembleDebug: + stage: build + script: + - ./gradlew assembleDebug + artifacts: + paths: + - app/build/outputs/ + +debugTests: + stage: test + script: + - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From 8bf25f63e397063e4f4cb7f21c1c2aa6b1613cfb Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 12:09:36 +0000 Subject: Update localized strings --- locale/gitlab.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 93bc7ab3a35..74aa62ebc23 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -321,10 +321,10 @@ msgstr "" msgid "A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}." msgstr "" -msgid "A ready-to-go Android app." +msgid "A ready-to-go template for use with Android apps." msgstr "" -msgid "A ready-to-go iOS Swift app." +msgid "A ready-to-go template for use with iOS Swift apps." msgstr "" msgid "A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable" -- cgit v1.2.1 From acef46099b7d117181cb34e0a5931826b763e1e8 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 14 Feb 2019 14:30:33 +0000 Subject: Initial commit with boilerplate --- app/assets/javascripts/projects/project_new.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 826b3d020f6..b9b42be6272 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -124,7 +124,6 @@ const bindEvents = () => { iosswift: { text: 'iOS (Swift)', icon: '.template-option svg.icon-iosswift', - }, android: { text: 'Android', icon: '.template-option svg.icon-android', -- cgit v1.2.1 From 89e529b1b30306b4a5f843c0277516e074537f1b Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Fri, 15 Feb 2019 08:43:32 +0000 Subject: Remove dash from template name --- app/assets/javascripts/projects/project_new.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index b9b42be6272..826b3d020f6 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -124,6 +124,7 @@ const bindEvents = () => { iosswift: { text: 'iOS (Swift)', icon: '.template-option svg.icon-iosswift', + }, android: { text: 'Android', icon: '.template-option svg.icon-android', -- cgit v1.2.1 From 9fe139040d6a684f3081f82efcc9833d9b651f93 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 09:56:24 +0000 Subject: Delete Android.gitlab-ci.yml since we are replacing it with full template --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 --------------------------- 1 file changed, 47 deletions(-) delete mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml deleted file mode 100644 index c169e3f7686..00000000000 --- a/lib/gitlab/ci/templates/Android.gitlab-ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny -# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. - -image: openjdk:8-jdk - -variables: - ANDROID_COMPILE_SDK: "28" - ANDROID_BUILD_TOOLS: "28.0.2" - ANDROID_SDK_TOOLS: "4333796" - -before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip - - unzip -d android-sdk-linux android-sdk.zip - - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - # temporarily disable checking for EPIPE error and use yes to accept all licenses - - set +o pipefail - - yes | android-sdk-linux/tools/bin/sdkmanager --licenses - - set -o pipefail - -stages: - - build - - test - -lintDebug: - stage: build - script: - - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint - -assembleDebug: - stage: build - script: - - ./gradlew assembleDebug - artifacts: - paths: - - app/build/outputs/ - -debugTests: - stage: test - script: - - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From 6bd57081791e68d1a7d431c409f4a82df5782b7a Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 12:14:21 +0000 Subject: Revert "Delete Android ci.yml template" This reverts commit 0def0b5ab1ceea2f3276ea125d666ddbdca0ce5b --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml new file mode 100644 index 00000000000..c169e3f7686 --- /dev/null +++ b/lib/gitlab/ci/templates/Android.gitlab-ci.yml @@ -0,0 +1,47 @@ +# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny +# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. + +image: openjdk:8-jdk + +variables: + ANDROID_COMPILE_SDK: "28" + ANDROID_BUILD_TOOLS: "28.0.2" + ANDROID_SDK_TOOLS: "4333796" + +before_script: + - apt-get --quiet update --yes + - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 + - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip + - unzip -d android-sdk-linux android-sdk.zip + - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null + - export ANDROID_HOME=$PWD/android-sdk-linux + - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ + - chmod +x ./gradlew + # temporarily disable checking for EPIPE error and use yes to accept all licenses + - set +o pipefail + - yes | android-sdk-linux/tools/bin/sdkmanager --licenses + - set -o pipefail + +stages: + - build + - test + +lintDebug: + stage: build + script: + - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint + +assembleDebug: + stage: build + script: + - ./gradlew assembleDebug + artifacts: + paths: + - app/build/outputs/ + +debugTests: + stage: test + script: + - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From 9d45c99f12a6a7906019fdc7f6610589249675f2 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 09:56:24 +0000 Subject: Delete Android.gitlab-ci.yml since we are replacing it with full template --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 --------------------------- 1 file changed, 47 deletions(-) delete mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml deleted file mode 100644 index c169e3f7686..00000000000 --- a/lib/gitlab/ci/templates/Android.gitlab-ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny -# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. - -image: openjdk:8-jdk - -variables: - ANDROID_COMPILE_SDK: "28" - ANDROID_BUILD_TOOLS: "28.0.2" - ANDROID_SDK_TOOLS: "4333796" - -before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip - - unzip -d android-sdk-linux android-sdk.zip - - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - # temporarily disable checking for EPIPE error and use yes to accept all licenses - - set +o pipefail - - yes | android-sdk-linux/tools/bin/sdkmanager --licenses - - set -o pipefail - -stages: - - build - - test - -lintDebug: - stage: build - script: - - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint - -assembleDebug: - stage: build - script: - - ./gradlew assembleDebug - artifacts: - paths: - - app/build/outputs/ - -debugTests: - stage: test - script: - - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From a41060eb65788237113313f9a8db94e700ca07e5 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Wed, 20 Feb 2019 12:14:21 +0000 Subject: Revert "Delete Android ci.yml template" This reverts commit 0def0b5ab1ceea2f3276ea125d666ddbdca0ce5b --- lib/gitlab/ci/templates/Android.gitlab-ci.yml | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 lib/gitlab/ci/templates/Android.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Android.gitlab-ci.yml b/lib/gitlab/ci/templates/Android.gitlab-ci.yml new file mode 100644 index 00000000000..c169e3f7686 --- /dev/null +++ b/lib/gitlab/ci/templates/Android.gitlab-ci.yml @@ -0,0 +1,47 @@ +# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny +# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template. + +image: openjdk:8-jdk + +variables: + ANDROID_COMPILE_SDK: "28" + ANDROID_BUILD_TOOLS: "28.0.2" + ANDROID_SDK_TOOLS: "4333796" + +before_script: + - apt-get --quiet update --yes + - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 + - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip + - unzip -d android-sdk-linux android-sdk.zip + - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null + - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null + - export ANDROID_HOME=$PWD/android-sdk-linux + - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ + - chmod +x ./gradlew + # temporarily disable checking for EPIPE error and use yes to accept all licenses + - set +o pipefail + - yes | android-sdk-linux/tools/bin/sdkmanager --licenses + - set -o pipefail + +stages: + - build + - test + +lintDebug: + stage: build + script: + - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint + +assembleDebug: + stage: build + script: + - ./gradlew assembleDebug + artifacts: + paths: + - app/build/outputs/ + +debugTests: + stage: test + script: + - ./gradlew -Pci --console=plain :app:testDebug -- cgit v1.2.1 From d2921d81f2d458ed7f395943bb2cbe5dcddacfc8 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 17:41:24 +0100 Subject: Update archive file --- vendor/project_templates/android.tar.gz | Bin 131447 -> 131057 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/vendor/project_templates/android.tar.gz b/vendor/project_templates/android.tar.gz index 9e408235fa4..1ed4ca06ee2 100644 Binary files a/vendor/project_templates/android.tar.gz and b/vendor/project_templates/android.tar.gz differ -- cgit v1.2.1 From 6622c2416f7c0ea45a09258552b86f114ff1e57b Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Thu, 21 Feb 2019 18:04:46 +0100 Subject: Use unmodified export --- vendor/project_templates/android.tar.gz | Bin 131057 -> 158682 bytes vendor/project_templates/iosswift.tar.gz | Bin 131447 -> 158682 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/vendor/project_templates/android.tar.gz b/vendor/project_templates/android.tar.gz index 1ed4ca06ee2..457a1f05fce 100644 Binary files a/vendor/project_templates/android.tar.gz and b/vendor/project_templates/android.tar.gz differ diff --git a/vendor/project_templates/iosswift.tar.gz b/vendor/project_templates/iosswift.tar.gz index 9e408235fa4..457a1f05fce 100644 Binary files a/vendor/project_templates/iosswift.tar.gz and b/vendor/project_templates/iosswift.tar.gz differ -- cgit v1.2.1 From 0f1ad411590631fb37bce63eb544c9ff10582786 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Fri, 22 Feb 2019 05:54:33 +0000 Subject: Replace iOS icon with GitLab icon for legal reasons --- app/assets/javascripts/projects/project_new.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 826b3d020f6..13ba6c858b3 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -123,7 +123,7 @@ const bindEvents = () => { }, iosswift: { text: 'iOS (Swift)', - icon: '.template-option svg.icon-iosswift', + icon: '.template-option svg.icon-gitlab', }, android: { text: 'Android', -- cgit v1.2.1 From 6c7b1977b40817ff8a7f3ef0bc4e10857cf7cd04 Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Fri, 22 Feb 2019 05:55:06 +0000 Subject: Remove Apple logo for legal reasons --- lib/gitlab/project_template.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 947a5392c0a..9667421e7e9 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -29,8 +29,8 @@ module Gitlab ProjectTemplate.new('spring', 'Spring', _('Includes an MVC structure, mvnw and pom.xml to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/spring', 'illustrations/logos/spring.svg'), ProjectTemplate.new('express', 'NodeJS Express', _('Includes an MVC structure to help you get started.'), 'https://gitlab.com/gitlab-org/project-templates/express', 'illustrations/logos/express.svg'), ProjectTemplate.new('dotnetcore', '.NET Core', _('A .NET Core console application template, customizable for any .NET Core project'), 'https://gitlab.com/gitlab-org/project-templates/dotnetcore', 'illustrations/logos/dotnet.svg'), - ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go iOS Swift app.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), 'illustrations/logos/apple.svg'), - ProjectTemplate.new('android', 'Android', _('A ready-to-go Android app.'), 'https://gitlab.com/gitlab-org/project-templates/android'), 'illustrations/logos/android.svg'), + ProjectTemplate.new('iosswift', 'iOS (Swift)', _('A ready-to-go template for use with iOS Swift apps.'), 'https://gitlab.com/gitlab-org/project-templates/iosswift'), + ProjectTemplate.new('android', 'Android', _('A ready-to-go template for use with Android apps.'), 'https://gitlab.com/gitlab-org/project-templates/android', 'illustrations/logos/android.svg'), ProjectTemplate.new('hugo', 'Pages/Hugo', _('Everything you need to create a GitLab Pages site using Hugo.'), 'https://gitlab.com/pages/hugo'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll.'), 'https://gitlab.com/pages/jekyll'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML.'), 'https://gitlab.com/pages/plain-html'), -- cgit v1.2.1