From b86eceb0f746995a36ff11a143b4112a39624259 Mon Sep 17 00:00:00 2001 From: Douglas Martins Date: Wed, 5 Jul 2017 14:08:35 -0300 Subject: [PATCH] =?UTF-8?q?Altera=C3=A7=C3=A3o=20do=20Manifest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 + gradle.properties | 21 +++++---- sample/sample.iml | 44 ++++++++--------- sample/src/main/AndroidManifest.xml | 2 +- stateprogressbar/src/main/AndroidManifest.xml | 2 +- stateprogressbar/stateprogressbar.iml | 47 +++++++++---------- 6 files changed, 55 insertions(+), 62 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 59e95cb..0d16100 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,6 +13,7 @@ + diff --git a/gradle.properties b/gradle.properties index 1d3591c..e586579 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,19 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - +## Project-wide Gradle settings. +# # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html - +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m +# Default value: -Xmx1024m -XX:MaxPermSize=256m # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - +# # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +#Wed Jul 05 13:59:29 BRT 2017 +systemProp.https.proxyPort=3128 +systemProp.http.proxyHost=192.168.14.2 +systemProp.https.proxyHost=192.168.14.2 +systemProp.http.proxyPort=3128 diff --git a/sample/sample.iml b/sample/sample.iml index 744c3e9..1e407c7 100644 --- a/sample/sample.iml +++ b/sample/sample.iml @@ -9,13 +9,9 @@