From 482ea42cd40bd3ad2110c07de8f519d73b1ae1f1 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 19 Jan 2018 23:13:04 +0100 Subject: Gradle Update to 3.0.1 with aapt --- build.gradle | 14 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- libs/MemorizingTrustManager/build.gradle | 2 +- libs/android-transcoder/build.gradle | 20 ++------- src/main/res/values-v21/themes.xml | 70 +++++++++++++++--------------- src/main/res/values/themes.xml | 74 ++++++++++++++++---------------- 6 files changed, 85 insertions(+), 97 deletions(-) diff --git a/build.gradle b/build.gradle index 645d6ac67..823b63cdc 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } @@ -57,9 +57,9 @@ dependencies { compile 'jetty:javax.servlet:5.1.12' compile 'com.google.code.gson:gson:2.8.0' compile 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' + compile 'com.android.support:multidex:1.0.2' compile "com.android.support:support-v13:$supportLibVersion" compile "com.android.support:appcompat-v7:$supportLibVersion" - compile 'com.android.support:multidex:1.0.1' compile "com.android.support:support-v4:$supportLibVersion" compile "com.android.support:support-emoji:$supportLibVersion" compile "com.android.support:support-emoji-bundled:$supportLibVersion" @@ -82,10 +82,6 @@ android { buildToolsVersion "26.0.2" defaultConfig { - jackOptions { - enabled true - } - minSdkVersion 16 targetSdkVersion 25 @@ -99,6 +95,8 @@ android { buildConfigField("Integer[]", "XMPP_Ports", "{61000, 65000}") buildConfigField("String", "DOMAIN_LOCK", '"pix-art.de"') buildConfigField("String", "UPDATE_URL", '"https://xmpp.pix-art.de/Pix-Art_Messenger/update/"') + + dimension "distribution" } dexOptions { @@ -113,6 +111,8 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + flavorDimensions("distribution") + productFlavors { standardPush standard @@ -122,6 +122,8 @@ android { buildConfigField("String", "DOMAIN_LOCK", "null") buildConfigField("String", "UPDATE_URL", '"https://xmpp.pix-art.de/Pix-Art_Messenger/update/open/"') applicationId "de.pixart.openmessenger" + + dimension "distribution" } } if (project.hasProperty('mStoreFile') && diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 730442ca6..e9d3f771b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle index 82dd7d0e2..712b3f80e 100644 --- a/libs/MemorizingTrustManager/build.gradle +++ b/libs/MemorizingTrustManager/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' } } diff --git a/libs/android-transcoder/build.gradle b/libs/android-transcoder/build.gradle index 7f562554c..2ae38852e 100644 --- a/libs/android-transcoder/build.gradle +++ b/libs/android-transcoder/build.gradle @@ -2,17 +2,13 @@ buildscript { repositories { jcenter() } - dependencies { - classpath 'com.novoda:bintray-release:0.2.4' - } } apply plugin: 'com.android.library' -apply plugin: 'bintray-release' android { compileSdkVersion 26 - buildToolsVersion '26.0.1' + buildToolsVersion '26.0.2' defaultConfig { minSdkVersion 18 @@ -22,19 +18,9 @@ android { buildTypes { release { zipAlignEnabled true - minifyEnabled false + minifyEnabled true shrinkResources false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } -} - -publish { - groupId = 'net.ypresto.androidtranscoder' - artifactId = 'android-transcoder' - version = '0.2.0' - licences = ['Apache-2.0'] - website = 'https://github.com/ypresto/android-transcoder' - autoPublish = false - dryRun = false -} +} \ No newline at end of file diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index bbb2184f1..0c0b3cefb 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -16,41 +16,41 @@ 18sp 5sp - @color/black87 - @color/black54 - - 24dp - 16dp - - @drawable/ic_group_add_white_24dp - @drawable/ic_person_add_white_24dp - @drawable/ic_cancel_white_24dp - @drawable/ic_content_copy_grey600_24dp - @drawable/ic_delete_white_24dp - @drawable/ic_file_download_white_24dp - @drawable/ic_edit_white_24dp - @drawable/ic_edit_grey600_24dp - @drawable/ic_done_black_24dp - @drawable/ic_reply_white_24dp - @drawable/ic_group_white_24dp - @drawable/ic_contacts_white_24dp - @drawable/ic_refresh_grey600_24dp - @drawable/ic_attach_file_white_24dp - @drawable/ic_lock_open_white_24dp - @drawable/ic_delete_grey600_24dp - @drawable/ic_search_white_24dp - @drawable/ic_lock_open_white_24dp - @drawable/ic_settings_grey600_24dp - @drawable/ic_import_export_white_24dp - @drawable/ic_share_white_24dp - @drawable/ic_barcode_scan_white_24dp - - @drawable/ic_attach_camera - @drawable/ic_attach_document - @drawable/ic_attach_location - @drawable/ic_attach_photo - @drawable/ic_attach_video - @drawable/ic_attach_record + @color/black87 + @color/black54 + + 24dp + 16dp + + @drawable/ic_group_add_white_24dp + @drawable/ic_person_add_white_24dp + @drawable/ic_cancel_white_24dp + @drawable/ic_content_copy_grey600_24dp + @drawable/ic_delete_white_24dp + @drawable/ic_file_download_white_24dp + @drawable/ic_edit_white_24dp + @drawable/ic_edit_grey600_24dp + @drawable/ic_done_black_24dp + @drawable/ic_reply_white_24dp + @drawable/ic_group_white_24dp + @drawable/ic_contacts_white_24dp + @drawable/ic_refresh_grey600_24dp + @drawable/ic_attach_file_white_24dp + @drawable/ic_lock_open_white_24dp + @drawable/ic_delete_grey600_24dp + @drawable/ic_search_white_24dp + @drawable/ic_lock_open_white_24dp + @drawable/ic_settings_grey600_24dp + @drawable/ic_import_export_white_24dp + @drawable/ic_share_white_24dp + @drawable/ic_barcode_scan_white_24dp + + @drawable/ic_attach_camera + @drawable/ic_attach_document + @drawable/ic_attach_location + @drawable/ic_attach_photo + @drawable/ic_attach_video + @drawable/ic_attach_record diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 01540d100..a20b5c6c6 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -12,46 +12,46 @@ 18sp 5sp - @color/black87 - @color/black54 + @color/black87 + @color/black54 - @drawable/ic_group_add_white_24dp - @drawable/ic_person_add_white_24dp - @drawable/ic_cancel_white_24dp - @drawable/ic_action_chat - @drawable/ic_content_copy_grey600_24dp - @drawable/ic_delete_white_24dp - @drawable/ic_file_download_white_24dp - @drawable/ic_edit_white_24dp - @drawable/ic_edit_grey600_24dp - @drawable/ic_done_black_24dp - @drawable/ic_group_white_24dp - @drawable/ic_contacts_white_24dp - @drawable/ic_attach_file_white_24dp - @drawable/ic_lock_open_white_24dp - @drawable/ic_reply_white_24dp - @drawable/ic_refresh_grey600_24dp - @drawable/ic_delete_grey600_24dp - @drawable/ic_search_white_24dp - @drawable/ic_lock_open_white_24dp - @drawable/ic_settings_grey600_24dp - @drawable/ic_import_export_white_24dp - @drawable/ic_share_white_24dp - @drawable/ic_barcode_scan_white_24dp - 16dp - 16dp + @drawable/ic_group_add_white_24dp + @drawable/ic_person_add_white_24dp + @drawable/ic_cancel_white_24dp + @drawable/ic_action_chat + @drawable/ic_content_copy_grey600_24dp + @drawable/ic_delete_white_24dp + @drawable/ic_file_download_white_24dp + @drawable/ic_edit_white_24dp + @drawable/ic_edit_grey600_24dp + @drawable/ic_done_black_24dp + @drawable/ic_group_white_24dp + @drawable/ic_contacts_white_24dp + @drawable/ic_attach_file_white_24dp + @drawable/ic_lock_open_white_24dp + @drawable/ic_reply_white_24dp + @drawable/ic_refresh_grey600_24dp + @drawable/ic_delete_grey600_24dp + @drawable/ic_search_white_24dp + @drawable/ic_lock_open_white_24dp + @drawable/ic_settings_grey600_24dp + @drawable/ic_import_export_white_24dp + @drawable/ic_share_white_24dp + @drawable/ic_barcode_scan_white_24dp + 16dp + 16dp - @drawable/ic_attach_camera - @drawable/ic_attach_document - @drawable/ic_attach_location - @drawable/ic_attach_photo - @drawable/ic_attach_video - @drawable/ic_attach_record + @drawable/ic_attach_camera + @drawable/ic_attach_document + @drawable/ic_attach_location + @drawable/ic_attach_photo + @drawable/ic_attach_video + @drawable/ic_attach_record - @drawable/ic_file_grey600_48dp - @drawable/ic_file_pdf_grey600_48dp - @drawable/ic_account_card_details_grey600_48dp - @drawable/ic_calendar_grey600_48dp + @drawable/ic_file_grey600_48dp + @drawable/ic_file_pdf_grey600_48dp + @drawable/ic_account_card_details_grey600_48dp + @drawable/ic_calendar_grey600_48dp