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

Commit 4e175427 authored by vince-bourgmayer's avatar vince-bourgmayer
Browse files

merge fix-e/apps/eDrive#23-nougat

parent 196f0922

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ stages: 
- build



before_script:

- git submodule sync

- git submodule update --init --recursive

- export GRADLE_USER_HOME=$(pwd)/.gradle

- chmod +x ./gradlew

.gitmodules

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[submodule "nextcloud-android-lib"]

	path = nextcloud-android-lib

	url = ../nextcloud-android-lib.git
 
 No newline at end of file

.idea/gradle.xml

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
          <set>

            <option value="$PROJECT_DIR$" />

            <option value="$PROJECT_DIR$/app" />

            <option value="$PROJECT_DIR$/nextcloud-android-lib" />

          </set>

        </option>

        <option name="resolveModulePerSourceSet" value="false" />

.idea/modules.xml

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  <component name="ProjectModuleManager">

    <modules>

      <module fileurl="file://$PROJECT_DIR$/Drive.iml" filepath="$PROJECT_DIR$/Drive.iml" />

      <module fileurl="file://$PROJECT_DIR$/nextcloud-android-lib/NextcloudLib.iml" filepath="$PROJECT_DIR$/nextcloud-android-lib/NextcloudLib.iml" />

      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />

      <module fileurl="file://$PROJECT_DIR$/eDrive.iml" filepath="$PROJECT_DIR$/eDrive.iml" />

    </modules>