Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
9
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Open sidebar
gitter
gitter-android-app
Commits
273cdf7a
Commit
273cdf7a
authored
Mar 24, 2020
by
Tomas Vik
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update fastlane and Android SDK
parent
d0182097
Pipeline
#129087685
passed with stages
in 14 minutes and 13 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
87 additions
and
77 deletions
+87
-77
.dockerignore
.dockerignore
+1
-0
Dockerfile
Dockerfile
+6
-22
Gemfile.lock
Gemfile.lock
+77
-52
app/build.gradle
app/build.gradle
+2
-2
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+1
-1
No files found.
.dockerignore
0 → 100644
View file @
273cdf7a
Dockerfile
Dockerfile
View file @
273cdf7a
# This Dockerfile creates a static build image for CI
FROM
openjdk:8-jdk
# Just matched `app/build.gradle`
ENV
ANDROID_COMPILE_SDK "26"
# Just matched `app/build.gradle`
ENV
ANDROID_BUILD_TOOLS "28.0.3"
# Version from https://developer.android.com/studio/releases/sdk-tools
ENV
ANDROID_SDK_TOOLS "24.4.1"
ENV
ANDROID_HOME /android-sdk-linux
ENV
PATH="${PATH}:/android-sdk-linux/platform-tools/"
# after two days of trying to install Android SDK without knowing anything about android development
# I've resulted to use existing up to date (even though not too popular) docker image
# https://github.com/menny/docker_android
FROM
menny/android:1.13.6
# install OS packages
RUN
apt-get
--quiet
update
--yes
RUN
apt-get
--quiet
install
--yes
wget
tar
unzip lib32stdc++6 lib32z1 build-essential
ruby ruby-dev
RUN
apt-get
--quiet
install
--yes
ruby ruby-dev
# We use this for xxd hex->binary
RUN
apt-get
--quiet
install
--yes
vim-common
# install Android SDK
RUN
wget
--quiet
--output-document
=
android-sdk.tgz https://dl.google.com/android/android-sdk_r
${
ANDROID_SDK_TOOLS
}
-linux
.tgz
RUN
tar
--extract
--gzip
--file
=
android-sdk.tgz
RUN
echo
y | android-sdk-linux/tools/android
--silent
update sdk
--no-ui
--all
--filter
android-
${
ANDROID_COMPILE_SDK
}
RUN
echo
y | android-sdk-linux/tools/android
--silent
update sdk
--no-ui
--all
--filter
platform-tools
RUN
echo
y | android-sdk-linux/tools/android
--silent
update sdk
--no-ui
--all
--filter
build-tools-
${
ANDROID_BUILD_TOOLS
}
RUN
echo
y | android-sdk-linux/tools/android
--silent
update sdk
--no-ui
--all
--filter
extra-android-m2repository
RUN
echo
y | android-sdk-linux/tools/android
--silent
update sdk
--no-ui
--all
--filter
extra-google-google_play_services
RUN
echo
y | android-sdk-linux/tools/android
--silent
update sdk
--no-ui
--all
--filter
extra-google-m2repository
# install FastLane
COPY
Gemfile.lock .
COPY
Gemfile .
RUN
gem
install
bundler
RUN
bundle
install
\ No newline at end of file
RUN
bundle
install
Gemfile.lock
View file @
273cdf7a
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.
0
)
addressable (2.
5.2
)
public_suffix (>= 2.0.2, <
4
.0)
CFPropertyList (3.0.
2
)
addressable (2.
7.0
)
public_suffix (>= 2.0.2, <
5
.0)
atomos (0.1.3)
babosa (1.0.2)
claide (1.0.2)
aws-eventstream (1.0.3)
aws-sdk (2.11.460)
aws-sdk-resources (= 2.11.460)
aws-sdk-core (2.11.460)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.11.460)
aws-sdk-core (= 2.11.460)
aws-sigv4 (1.1.1)
aws-eventstream (~> 1.0, >= 1.0.2)
babosa (1.0.3)
claide (1.0.3)
colored (1.2)
colored2 (3.1.2)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
declarative (0.0.10)
declarative-option (0.1.0)
domain_name (0.5.20180417)
digest-crc (0.5.1)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.
5.0
)
emoji_regex (
0.1
.1)
excon (0.
6
2.0)
faraday (0.1
5.4
)
dotenv (2.
7.5
)
emoji_regex (
1.0
.1)
excon (0.
7
2.0)
faraday (0.1
7.3
)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.1
2.2
)
faraday_middleware (0.1
3.1
)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.
5
)
fastlane (2.1
09.1
)
fastimage (2.1.
7
)
fastlane (2.1
43.0
)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
aws-sdk (~> 2.3)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, <
2
.0.0)
bundler (>= 1.12.0, <
3
.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (
~
> 0.1)
excon (>= 0.
45
.0, < 1.0.0)
faraday (~> 0.
9
)
emoji_regex (>
=
0.1
, < 2.0
)
excon (>= 0.
71
.0, < 1.0.0)
faraday (~> 0.
17
)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.
9
)
faraday_middleware (~> 0.
13.1
)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.21.2, < 0.24.0)
google-api-client (>= 0.29.2, < 0.37.0)
google-cloud-storage (>= 1.15.0, < 2.0.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
mini_magick (~> 4.5.1
)
m
ulti_json
jwt (~> 2.1.0
)
m
ini_magick (>= 4.9.4, < 5.0.0)
multi_xml (~> 0.5)
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
public_suffix (~> 2.0.0)
rubyzip (>= 1.
2.2
, < 2.0.0)
rubyzip (>= 1.
3.0
, < 2.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>=
1.6.2
, <
2
.0.0)
terminal-notifier (>=
2.0.0
, <
3
.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.
6
.0, < 2.0.0)
xcodeproj (>= 1.
13
.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-api-client (0.
23.9
)
google-api-client (0.
36.4
)
addressable (~> 2.5, >= 2.5.1)
googleauth (>
=
0.
5, < 0.7.0
)
googleauth (
~
> 0.
9
)
httpclient (>= 2.8.1, < 3.0)
mi
me-types
(~>
3
.0)
mi
ni_mime
(~>
1
.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.9)
googleauth (0.6.7)
faraday (~> 0.12)
signet (~> 0.12)
google-cloud-core (1.5.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.3.1)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.0)
google-cloud-storage (1.25.1)
addressable (~> 2.5)
digest-crc (~> 0.4)
google-api-client (~> 0.33)
google-cloud-core (~> 1.2)
googleauth (~> 0.9)
mini_mime (~> 1.0)
googleauth (0.11.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.
7
)
signet (~> 0.
12
)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
json (2.1.0)
jmespath (1.4.0)
json (2.3.0)
jwt (2.1.0)
memoist (0.16.0)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mini_magick (4.5.1)
multi_json (1.13.1)
memoist (0.16.2)
mini_magick (4.10.1)
mini_mime (1.0.2)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nanaimo (0.2.6)
naturally (2.2.0)
os (1.0.
0
)
plist (3.
4
.0)
os (1.0.
1
)
plist (3.
5
.0)
public_suffix (2.0.5)
representable (3.0.4)
declarative (< 0.1.0)
...
...
@@ -103,31 +128,31 @@ GEM
uber (< 0.2.0)
retriable (3.1.2)
rouge (2.0.7)
rubyzip (1.
2.2
)
rubyzip (1.
3.0
)
security (0.1.3)
signet (0.1
1
.0)
signet (0.1
3
.0)
addressable (~> 2.3)
faraday (
~
> 0.
9
)
faraday (>
=
0.
17.3, < 2.0
)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.
5
)
simctl (1.6.
8
)
CFPropertyList
naturally
slack-notifier (2.3.2)
terminal-notifier (
1.8
.0)
terminal-notifier (
2.0
.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tty-cursor (0.
6.0
)
tty-screen (0.
6.5
)
tty-spinner (0.9.
0
)
tty-cursor (~> 0.
6.0
)
tty-cursor (0.
7.1
)
tty-screen (0.
7.1
)
tty-spinner (0.9.
3
)
tty-cursor (~> 0.
7
)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.
5
)
unicode-display_width (1.
4.0
)
unf_ext (0.0.7.
6
)
unicode-display_width (1.
6.1
)
word_wrap (1.0.0)
xcodeproj (1.
7
.0)
xcodeproj (1.
15
.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
...
...
app/build.gradle
View file @
273cdf7a
...
...
@@ -41,13 +41,13 @@ task fetchWebappAssets() {
}
android
{
compileSdkVersion
2
6
compileSdkVersion
2
8
buildToolsVersion
'28.0.3'
defaultConfig
{
applicationId
"im.gitter.gitter"
minSdkVersion
19
targetSdkVersion
2
6
targetSdkVersion
2
8
versionCode
Integer
.
valueOf
(
System
.
env
.
VERSION_CODE
?:
0
)
// Manually bump the semver version part of the string as necessary
versionName
"3.4.0-${System.env.VERSION_SHA}"
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
273cdf7a
...
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
6
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
10
-all.zip
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment