Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0163eb74 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge tag 'v0.2.17.204714' into merge-v0.2.17.204714

parents 0c3ac354 baf890cf

.github/workflows/build.yml

0 → 100644
+13 −0
Original line number Original line Diff line number Diff line 
name: Build

on: [pull_request, push]

jobs:

  build:

    runs-on: ubuntu-latest

    steps:

      - uses: actions/checkout@v2

        with:

          fetch-depth: 0

      - run: ./gradlew --no-daemon build

        env:

          TERM: dumb

          JAVA_OPTS: -Xmx2048m

.gitmodules

+0 −8
Original line number Original line Diff line number Diff line 
[submodule "extern/Wearable"]

	path = extern/Wearable

	url = https://gitlab.e.foundation/e/apps/Wearable

	branch = dev

[submodule "extern/RemoteDroidGuard"]

	path = extern/RemoteDroidGuard

	url = https://gitlab.e.foundation/e/apps/android_packages_apps_RemoteDroidGuard

	branch = dev

.travis.yml

deleted100644 → 0
+0 −15
Original line number Original line Diff line number Diff line 
language: java

jdk: openjdk8

install:

  - mkdir $HOME/android-cmdline-tools

  - curl https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip > $HOME/android-cmdline-tools/cmdline-tools.zip

  - unzip -qq -n $HOME/android-cmdline-tools/cmdline-tools.zip -d $HOME/android-cmdline-tools

  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platform-tools'

  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'build-tools;29.0.3'

  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platforms;android-30'

env:

  - ANDROID_HOME=$HOME/android-sdk TERM=dumb JAVA_OPTS="-Xmx2048m"

before_script:

  - echo sdk.dir $ANDROID_HOME > local.properties

script:

  - ./gradlew --no-daemon build

README.md

+1 −1
Original line number Original line Diff line number Diff line 
<img src="http://i.imgur.com/hXY4lcC.png" height="42px" alt="microG" /> Services Core (GmsCore)

<img src="http://i.imgur.com/hXY4lcC.png" height="42px" alt="microG" /> Services Core (GmsCore)

=======

=======

[![Build Status](https://travis-ci.com/microg/GmsCore.svg?branch=master)](https://travis-ci.com/microg/GmsCore)

[![Build Status](https://github.com/microg/GmsCore/workflows/Build/badge.svg)](https://travis-ci.com/microg/GmsCore)





microG GmsCore is a FLOSS (Free/Libre Open Source Software) framework to allow applications designed for Google Play Services to run on systems, where Play Services is not available.

microG GmsCore is a FLOSS (Free/Libre Open Source Software) framework to allow applications designed for Google Play Services to run on systems, where Play Services is not available.

build.gradle

+1 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ def execResult(...args) { 
    return stdout.toString().trim()

    return stdout.toString().trim()

}

}





def gmsVersion = "20.47.13"

def gmsVersion = "20.47.14"

def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))

def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))

def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').substring(1)

def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').substring(1)

def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD"))

def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD"))