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

Commit 37caecf5 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'dev' into 'master' 

[RELEASE] Sprint Istanbul

See merge request e/apps/tasks!4
parents 8431d4a0 bbc5b855

.gitlab-ci.yml

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



stages:

  - build



variables:

  GRADLE_VERSION: "gradle-5.4.1"

  GIT_SUBMODULE_STRATEGY: "recursive"



before_script:

  - git fetch

  - export GRADLE_USER_HOME=$(pwd)/.gradle

  - curl -sL https://services.gradle.org/distributions/${GRADLE_VERSION}-bin.zip -o /gradle.zip

  - unzip /gradle.zip -d /gradle

  - PATH="$PATH:/gradle/${GRADLE_VERSION}/bin"

  - JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS} -Dfile.encoding=UTF8"

  - gradle dependencies



cache:

  key: ${CI_PROJECT_ID}

  paths:

    - .gradle/



build:

  stage: build

  script:

    - gradle assemble

  artifacts:

    paths:

      - opentasks/build/outputs/

opentasks-provider/src/main/res/values/opentasks_defaults.xml

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


    <!-- The name of the task authority. -->

    <string name="opentasks_authority"

            translatable="false">org.dmfs.tasks</string>

            translatable="false">foundation.e.tasks</string>



</resources>
 
 No newline at end of file

opentasks-provider/src/test/java/org/dmfs/provider/tasks/processors/tasks/instancedata/DatedTest.java

+5 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package org.dmfs.provider.tasks.processors.tasks.instancedata;



import android.content.ContentValues;

import android.util.Log;



import org.dmfs.jems.optional.elementary.Present;

import org.dmfs.provider.tasks.utils.ContentValuesWithLong;
@@ -53,7 +54,9 @@ public class DatedTest 
    {

        DateTime start = DateTime.parse("Europe/Berlin", "20171208T125500");



        ContentValues instanceData = new Dated(new Present<>(start), "ts", "sorting", ContentValues::new).value();

        ContentValues instanceData = new Dated(new Present<>(start),

                "ts",

                "sorting", ContentValues::new).value();



        assertThat(instanceData, new ContentValuesWithLong("ts", start.getTimestamp()));

        assertThat(instanceData, new ContentValuesWithLong("sorting",  start.getInstance()));

opentasks/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ def gitCommitNo = { ref -> 
android {

    compileSdkVersion COMPILE_SDK_VERSION.toInteger()

    defaultConfig {

        applicationId "org.dmfs.tasks"

        applicationId "foundation.e.tasks"

        minSdkVersion MIN_SDK_VERSION.toInteger()

        targetSdkVersion TARGET_SDK_VERSION.toInteger()

        // spread version code to allow inserting versions if necessary

opentasks/src/main/AndroidManifest.xml

+11 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
            android:name=".TasksApplication"

            android:icon="@mipmap/ic_launcher"

            android:label="@string/app_name"

            android:roundIcon="@mipmap/ic_launcher_round"

            android:supportsRtl="false"

            android:taskAffinity="org.dmfs.tasks.TaskListActivity"

            android:theme="@style/OpenTasksAppTheme">
@@ -152,6 +151,17 @@ 
                    android:value="org.dmfs.tasks.TaskListActivity"/>

        </activity>



        <activity

            android:name=".AboutActivity"

            android:label="@string/title_activity_settings"

            android:parentActivityName=".TaskListActivity"

            android:theme="@style/AppTheme">

            <meta-data

                android:name="android.support.PARENT_ACTIVITY"

                android:value="org.dmfs.tasks.TaskListActivity"/>

        </activity>





        <!-- homescreen widgets -->

        <activity

                android:name=".homescreen.TaskListWidgetSettingsActivity"