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

Commit 950239ee authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Merge remote-tracking branch 'origin/bitfireAT/master' 

# Conflicts:
#	.gitlab-ci.yml
#	build.gradle
#	src/androidTest/java/foundation/e/vcard4android/AndroidAddressBookTest.kt
#	src/androidTest/java/foundation/e/vcard4android/AndroidContactTest.kt
#	src/androidTest/java/foundation/e/vcard4android/AndroidGroupTest.kt
parents e1cbe8dd f2db5fb1

build.gradle

+13 −11
Original line number Original line Diff line number Diff line 




buildscript {

buildscript {

    ext.kotlin_version = '1.3.10'

    ext.versions = [

    ext.dokka_version = '0.9.17'

        kotlin: '1.3.31',

        dokka: '0.9.17'

    ]





    repositories {

    repositories {

        google()

        google()
@@ -9,9 +11,9 @@ buildscript { 
    }

    }





    dependencies {

    dependencies {

        classpath 'com.android.tools.build:gradle:3.2.1'

        classpath 'com.android.tools.build:gradle:3.4.1'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"

        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka_version"

        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}"

    }

    }

}

}
@@ -49,18 +51,18 @@ android { 
    }

    }





    defaultConfig {

    defaultConfig {

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    }

}

}





dependencies {

dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"





    implementation 'org.apache.commons:commons-text:1.1'

    implementation 'org.apache.commons:commons-text:1.6'

    implementation 'commons-io:commons-io:2.6'

    implementation 'commons-io:commons-io:2.6'





    // ez-vcard to parse/generate VCards

    // ez-vcard to parse/generate VCards

    api('com.googlecode.ez-vcard:ez-vcard:0.10.4') {

    api('com.googlecode.ez-vcard:ez-vcard:0.10.5') {

        // hCard functionality not needed

        // hCard functionality not needed

        exclude group: 'org.jsoup'

        exclude group: 'org.jsoup'

        exclude group: 'org.freemarker'

        exclude group: 'org.freemarker'
@@ -68,8 +70,8 @@ dependencies { 
        exclude group: 'com.fasterxml.jackson.core'

        exclude group: 'com.fasterxml.jackson.core'

    }

    }





    androidTestImplementation 'com.android.support.test:runner:1.0.2'

    androidTestImplementation 'androidx.test:runner:1.1.1'

    androidTestImplementation 'com.android.support.test:rules:1.0.2'

    androidTestImplementation 'androidx.test:rules:1.1.1'





    testImplementation 'junit:junit:4.12'

    testImplementation 'junit:junit:4.12'

}
 
}

gradle.properties

+1 −0
Original line number Original line Diff line number Diff line 
org.gradle.jvmargs=-Xmx1536M

org.gradle.jvmargs=-Xmx1536M

android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

+2 −2
Original line number Original line Diff line number Diff line 
#Tue Aug 23 16:42:17 CEST 2016

#Wed Apr 17 22:31:47 CEST 2019

distributionBase=GRADLE_USER_HOME

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

src/androidTest/java/foundation/e/vcard4android/AndroidAddressBookTest.kt

+6 −5
Original line number Original line Diff line number Diff line
@@ -13,8 +13,8 @@ import android.accounts.Account 
import android.content.ContentProviderClient

import android.content.ContentProviderClient

import android.content.ContentValues

import android.content.ContentValues

import android.provider.ContactsContract

import android.provider.ContactsContract

import android.support.test.InstrumentationRegistry

import androidx.test.platform.app.InstrumentationRegistry

import android.support.test.rule.GrantPermissionRule

import androidx.test.rule.GrantPermissionRule

import foundation.e.vcard4android.impl.TestAddressBook

import foundation.e.vcard4android.impl.TestAddressBook

import org.junit.After

import org.junit.After

import org.junit.Assert.*

import org.junit.Assert.*
@@ -33,13 +33,14 @@ class AndroidAddressBookTest { 




	@Before

	@Before

	fun connect() {

	fun connect() {

        val context = InstrumentationRegistry.getContext()

        val context = InstrumentationRegistry.getInstrumentation().context

		provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)

		provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!

        assertNotNull(provider)

        assertNotNull(provider)

    }

    }





	@After

	@After

	fun disconnect() {

	fun disconnect() {

        @Suppress("DEPRECATION")

        provider.release()

        provider.release()

    }

    }

src/androidTest/java/foundation/e/vcard4android/AndroidContactTest.kt

+7 −6
Original line number Original line Diff line number Diff line
@@ -12,11 +12,11 @@ import android.Manifest 
import android.accounts.Account

import android.accounts.Account

import android.content.ContentProviderClient

import android.content.ContentProviderClient

import android.provider.ContactsContract

import android.provider.ContactsContract

import android.support.test.InstrumentationRegistry

import android.support.test.filters.MediumTest

import android.support.test.filters.SmallTest

import android.support.test.rule.GrantPermissionRule

import android.util.Base64

import android.util.Base64

import androidx.test.filters.MediumTest

import androidx.test.filters.SmallTest

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.rule.GrantPermissionRule

import foundation.e.vcard4android.impl.TestAddressBook

import foundation.e.vcard4android.impl.TestAddressBook

import ezvcard.VCardVersion

import ezvcard.VCardVersion

import ezvcard.property.Address

import ezvcard.property.Address
@@ -45,8 +45,8 @@ class AndroidContactTest { 




    @Before

    @Before

    fun connect() {

    fun connect() {

        val context = InstrumentationRegistry.getContext()

        val context = InstrumentationRegistry.getInstrumentation().context

        provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)

        provider = context.contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY)!!

        assertNotNull(provider)

        assertNotNull(provider)





        addressBook = TestAddressBook(testAccount, provider)

        addressBook = TestAddressBook(testAccount, provider)
@@ -54,6 +54,7 @@ class AndroidContactTest { 




    @After

    @After

    fun disconnect() {

    fun disconnect() {

        @Suppress("DEPRECATION")

        provider.release()

        provider.release()

    }

    }