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

Commit e73d7fae authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Update Gradle

parent 1e8926ed

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip

microg-ui-tools/build.gradle

+8 −8
Original line number Diff line number Diff line
@@ -19,18 +19,18 @@ buildscript { 
        jcenter()

    }

    dependencies {

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

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

    }

}

apply plugin: 'com.android.library'



String getMyVersionName() {

    def stdout = new ByteArrayOutputStream()

    exec {

        commandLine 'git', 'describe', '--tags', '--always', '--dirty'

        standardOutput = stdout

    }

    return stdout.toString().trim()

    if (rootProject.file("gradlew").exists())

        exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout }

    else // automatic build system, don't tag dirty

        exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout }

    return stdout.toString().trim().substring(1)

}



android {
@@ -51,7 +51,7 @@ android { 
}



dependencies {

    compile 'com.android.support:support-v4:23.1.1'

    compile 'com.android.support:appcompat-v7:23.1.1'

    compile 'com.android.support:support-v4:23.3.0'

    compile 'com.android.support:appcompat-v7:23.3.0'

}

microg-ui-tools/src/main/java/org/microg/tools/ui/AbstractAboutFragment.java

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ public abstract class AbstractAboutFragment extends Fragment { 


        List<Library> libraries = new ArrayList<Library>();

        libraries.add(new Library(BuildConfig.APPLICATION_ID, getString(R.string.lib_name), getString(R.string.lib_license)));

        libraries.add(new Library("android.support.v4", getString(R.string.about_android_support_v4), getString(R.string.about_android_support_license)));

        libraries.add(new Library("android.support.v7.appcompat", getString(R.string.about_android_support_v7_appcompat), getString(R.string.about_android_support_license)));

        collectLibraries(libraries);

        Collections.sort(libraries);

        ((ListView) aboutRoot.findViewById(android.R.id.list)).setAdapter(new LibraryAdapter(getContext(), libraries.toArray(new Library[libraries.size()])));

microg-ui-tools/src/main/res/values/strings.xml

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


<resources>

    <string name="lib_name">microG UI Tools</string>

    <string name="lib_license">Apache License 2.0, Copyright © microG Team</string>

    <string name="lib_license">Apache License 2.0 by microG Team</string>



    <string name="about_version_str">Version %1$s</string>

    <string name="about_name_version_str">%1$s %2$s</string>
@@ -36,4 +36,8 @@ 
    <string name="about_root_summary">Summary</string>

    <string name="about_root_version">Version v0.1.0</string>

    <string name="about_root_libraries">Included libraries</string>



    <string name="about_android_support_v4">v4 Support Library</string>

    <string name="about_android_support_v7_appcompat">v7 appcompat Support Library</string>

    <string name="about_android_support_license">Apache License 2.0 by The Android Open Source Project</string>

</resources>