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

Commit acefd595 authored by vince-bourgmayer's avatar vince-bourgmayer
Browse files

merge OS_integration to eelo-0.1

parent e9e30d5f

.gitlab-ci.yml

0 → 100644
+21 −0
Original line number Original line Diff line number Diff line 
image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest"



stages:

- build



before_script:

- export GRADLE_USER_HOME=$(pwd)/.gradle

- chmod +x ./gradlew



cache:

  key: ${CI_PROJECT_ID}

  paths:

  - .gradle/



build:

  stage: build

  script:

  - ./gradlew build

  artifacts:

    paths:

    - app/build/outputs/apk/

.idea/misc.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 
      </value>

      </value>

    </option>

    </option>

  </component>

  </component>

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">

    <output url="file://$PROJECT_DIR$/build/classes" />

    <output url="file://$PROJECT_DIR$/build/classes" />

  </component>

  </component>

  <component name="ProjectType">

  <component name="ProjectType">

LICENCE

0 → 100644
+674 −0

File added.

Preview size limit exceeded, changes collapsed.

README.md

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 








#### Actu:

#### Actu:

This branch is up-to-date (2018-08-20).

This branch is for the last run before the closed bêta in august's end.









#### TODO:

#### TODO: