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

Commit 876692ef authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge 2e28a95a into 00564413

parents 00564413 2e28a95a

AndroidManifest.xml

+18 −2
Original line number Diff line number Diff line
@@ -29,8 +29,24 @@ 
    android:versionName="1.0.13" >



    <uses-sdk

        android:minSdkVersion="11"

        android:targetSdkVersion="24" />

        android:minSdkVersion="14"

        android:targetSdkVersion="26"/>



    <uses-permission

        android:maxSdkVersion="22"

        android:name="android.permission.AUTHENTICATE_ACCOUNTS" />

    <uses-permission

        android:maxSdkVersion="22"

        android:name="android.permission.GET_ACCOUNTS" />

    <uses-permission

        android:maxSdkVersion="22"

        android:name="android.permission.MANAGE_ACCOUNTS" />

    <uses-permission

        android:maxSdkVersion="22"

        android:name="android.permission.USE_CREDENTIALS" />

    <uses-permission

        android:maxSdkVersion="22"

        android:name="android.permission.ACCESS_NETWORK_STATE" />



</manifest>

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ dependencies { 
}



android {

    compileSdkVersion 25

    compileSdkVersion 26

    buildToolsVersion '26.0.2'



    sourceSets {

sample_client/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
    <uses-permission android:name="android.permission.INTERNET"/>



    <uses-sdk

        android:minSdkVersion="11"

        android:targetSdkVersion="24"/>

        android:minSdkVersion="14"

        android:targetSdkVersion="26"/>



    <application

        android:icon="@drawable/ic_launcher"

sample_client/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ dependencies { 
}



android {

    compileSdkVersion 25

    compileSdkVersion 26

    buildToolsVersion '26.0.2'



    sourceSets {

scripts/lint/lint-results.txt

+1 −1
Original line number Diff line number Diff line 
DO NOT TOUCH; GENERATED BY DRONE

      <span class="mdl-layout-title">Lint Report: 31 errors and 16 warnings</span>
 
      <span class="mdl-layout-title">Lint Report: 4 errors and 15 warnings</span>