Skip to content
Snippets Groups Projects
Commit 35eba923 authored by Jawnnypoo's avatar Jawnnypoo
Browse files

Merge remote-tracking branch 'origin/develop'

parents 8675a0f4 8b71a5d0
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 433 additions and 77 deletions
app/src/main/res/layout/fragment_build_description.xml
+ 27
− 0
View file @ 35eba923
@@ -32,6 +32,33 @@
android:orientation="vertical"
android:padding="8dp">
 
<TextView
android:id="@+id/text_pipeline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Pipeline: #123"/>
<TextView
android:id="@+id/text_stage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Stage: build"/>
<TextView
android:id="@+id/text_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Name: build"/>
<TextView
android:id="@+id/text_status"
android:layout_width="wrap_content"
app/src/main/res/layout/fragment_pipeline_description.xml 0 → 100644
+ 157
− 0
View file @ 35eba923
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.commit451.gitlab.view.LabCoatSwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v7.widget.CardView
style="@style/Card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<TextView
android:id="@+id/text_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Pipeline: #123"/>
<TextView
android:id="@+id/text_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Status: success"/>
<TextView
android:id="@+id/text_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Duration: 46 minutes"/>
<TextView
android:id="@+id/text_created"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Created: 46 minutes ago"/>
<TextView
android:id="@+id/text_finished"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Finished: 46 minutes ago"/>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
style="@style/Card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:text="@string/build_commit"
android:textAppearance="?android:attr/textAppearanceLarge"/>
<TextView
android:id="@+id/text_ref"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Ref: master"/>
<TextView
android:id="@+id/text_sha"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="SHA: f4hf92f7"/>
<TextView
android:id="@+id/text_author"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Author: Noah Prail"/>
<TextView
android:id="@+id/text_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Message: Some commit message."/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
</ScrollView>
</com.commit451.gitlab.view.LabCoatSwipeRefreshLayout>
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_pipelines.xml 0 → 100644
+ 51
− 0
View file @ 35eba923
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<Spinner
android:id="@+id/issue_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"/>
<com.commit451.gitlab.view.LabCoatSwipeRefreshLayout
android:id="@+id/swipe_layout"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<!--
We set the padding bottom so that the FAB is not covered
It is the size of the FAB 56dp + 8dp padding
-->
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="64dp"
android:clipToPadding="false"
/>
</com.commit451.gitlab.view.LabCoatSwipeRefreshLayout>
</LinearLayout>
<TextView
android:id="@+id/message_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/no_issues"
android:gravity="center"
android:layout_gravity="center"
android:visibility="gone"/>
</FrameLayout>
app/src/main/res/layout/item_build.xml
+ 9
− 0
View file @ 35eba923
@@ -9,6 +9,15 @@
android:orientation="horizontal"
android:padding="16dp">
 
<TextView
android:id="@+id/name"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="8dp"
android:textSize="@dimen/text_size_small"
tools:text="Name: build"/>
<TextView
android:id="@+id/number"
android:layout_width="0dp"
app/src/main/res/layout/item_issue.xml
+ 3
− 2
View file @ 35eba923
@@ -16,8 +16,8 @@
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="8dp"
android:layout_weight="1"
android:orientation="vertical">
android:orientation="vertical"
android:layout_weight="1">
 
<TextView
android:id="@+id/issue_message"
@@ -25,6 +25,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:drawablePadding="8dp"
android:textSize="@dimen/text_size_small"
tools:text="I commited all the code at once cause I am cool. So sorry" />
 
app/src/main/res/layout/item_pipeline.xml 0 → 100644
+ 51
− 0
View file @ 35eba923
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
android:padding="16dp">
<TextView
android:id="@+id/number"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="8dp"
android:textSize="@dimen/text_size_small"
tools:text="Pipeline: #123"/>
<TextView
android:id="@+id/status"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="8dp"
android:textSize="@dimen/text_size_small"
tools:text="Status: running"/>
<TextView
android:id="@+id/sha"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="8dp"
android:textSize="@dimen/text_size_small"
tools:text="Commit: ac4c0b18"/>
<TextView
android:id="@+id/ref"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="8dp"
android:textSize="@dimen/text_size_small"
tools:text="Ref: ac4c0b18"/>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/widget_item_entry.xml
+ 5
− 3
View file @ 35eba923
@@ -2,14 +2,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
android:orientation="horizontal"
android:id="@+id/root">
android:paddingTop="8dp">
 
<ImageView
android:id="@+id/image"
@@ -32,6 +32,7 @@
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="Project" />
 
@@ -39,6 +40,7 @@
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="I like this project because its called a project and it has a really long description that should cut off after a few lines" />
 
app/src/main/res/menu/close.xml
+ 1
− 1
View file @ 35eba923
@@ -3,6 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_close"
app:showAsAction="ifRoom"
app:showAsAction="never"
android:title="@string/action_close"/>
</menu>
\ No newline at end of file
app/src/main/res/menu/create.xml
+ 0
− 1
View file @ 35eba923
@@ -5,7 +5,6 @@
<item
android:id="@+id/action_create"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_add_24dp"
android:title="@string/action_create"/>
 
</menu>
\ No newline at end of file
app/src/main/res/menu/delete.xml
+ 1
− 1
View file @ 35eba923
@@ -4,7 +4,7 @@
 
<item
android:id="@+id/action_delete"
app:showAsAction="ifRoom"
app:showAsAction="never"
android:title="@string/action_delete"/>
 
</menu>
\ No newline at end of file
app/src/main/res/values/colors.xml
+ 1
− 1
View file @ 35eba923
@@ -23,5 +23,5 @@
<color name="window_background">#303030</color>
 
<color name="scrim">#99323232</color>
<color name="black_overlay">#66000000</color>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
+ 65
− 13
View file @ 35eba923
@@ -42,7 +42,8 @@
<string name="title_files">Files</string>
<string name="title_merge_requests">Merge Requests</string>
<string name="title_members">Members</string>
<string name="title_builds">Builds</string>
<string name="title_pipelines">Pipelines</string>
<string name="title_builds">Jobs</string>
<string name="title_snippets">Snippets</string>
 
<string-array name="main_tabs">
@@ -50,6 +51,7 @@
<item>@string/title_activity</item>
<item>@string/title_files</item>
<item>@string/title_commits</item>
<item>@string/title_pipelines</item>
<item>@string/title_builds</item>
<item>@string/title_milestones</item>
<item>@string/title_issues</item>
@@ -190,7 +192,7 @@
<string name="title_hint">Title</string>
<string name="description_hint">Description</string>
<string name="add_note_content_description">Add note</string>
<string name="issue_number">Issue #</string>
<string name="issue_number">Issue #%1$d</string>
<string name="reopen">Reopen</string>
<string name="close">Close</string>
<string name="created_issue">created issue</string>
@@ -220,7 +222,7 @@
<string name="label_already_added">Label already added</string>
<string name="failed_to_delete_issue">Failed to delete issue</string>
<string name="issue_deleted">Issue deleted</string>
<string name="confidential">Confidential</string>
<string name="confidential_message">This issue is confidential and should only be visible to team members with at least Reporter access.</string>
 
<!-- Labels -->
<string name="labels">Labels</string>
@@ -371,9 +373,54 @@
<!-- Settings -->
<string name="settings">Settings</string>
 
<!-- Pipelines -->
<string name="no_pipelines">No pipeline</string>
<string name="failed_to_load_pipelines">Failed to load pipeline</string>
<string-array name="pipeline_scope_names">
<item>All</item>
<item>Pending</item>
<item>Running</item>
<item>Failed</item>
<item>Success</item>
<item>Canceled</item>
</string-array>
<string-array name="pipeline_scope_values">
<item>@null</item>
<item>pending</item>
<item>running</item>
<item>failed</item>
<item>success</item>
<item>canceled</item>
</string-array>
<string name="pipeline_number">Pipeline #%1$s</string>
<string name="pipeline_started">Pipeline started</string>
<string name="pipeline_erased">Pipeline erased</string>
<string name="pipeline_canceled">Pipeline canceled</string>
<string name="unable_to_retry_pipeline">Unable to retry pipeline</string>
<string name="unable_to_erase_pipeline">Unable to erase pipeline</string>
<string name="unable_to_cancel_pipeline">Unable to cancel pipeline</string>
<string name="unable_to_load_pipeline">Unable to load pipeline</string>
<string-array name="pipeline_tabs">
<item>Details</item>
<!--<item>Jobs</item>-->
</string-array>
<string name="pipeline_pipeline">Pipeline: #%1$s</string>
<string name="pipeline_name">Name: Pipeline #%1$s</string>
<string name="pipeline_ref">Ref: %1$s</string>
<string name="pipeline_status">Status: %1$s</string>
<string name="pipeline_duration">Duration: %1$s minutes</string>
<string name="pipeline_created">Created: %1$s</string>
<string name="pipeline_finished">Finished: %1$s</string>
<string name="pipeline_sha">Commit: %1$s</string>
<string name="pipeline_commit">Commit</string>
<string name="pipeline_commit_branch">Branch: %1$s</string>
<string name="pipeline_commit_author">Author: %1$s</string>
<string name="pipeline_commit_message">Message: %1$s</string>
<!-- Builds -->
<string name="no_builds">No builds</string>
<string name="failed_to_load_builds">Failed to load builds</string>
<string name="no_builds">No jobs</string>
<string name="failed_to_load_builds">Failed to load jobs</string>
 
<string-array name="build_scope_names">
<item>All</item>
@@ -391,18 +438,21 @@
<item>success</item>
<item>canceled</item>
</string-array>
<string name="build_number">Build #</string>
<string name="build_started">Build started</string>
<string name="build_erased">Build erased</string>
<string name="build_canceled">Build canceled</string>
<string name="unable_to_retry_build">Unable to retry build</string>
<string name="unable_to_erase_build">Unable to erase build</string>
<string name="unable_to_cancel_build">Unable to cancel build</string>
<string name="unable_to_load_build">Unable to load build</string>
<string name="build_number">Job #%1$s</string>
<string name="build_started">Job started</string>
<string name="build_erased">Job erased</string>
<string name="build_canceled">Job canceled</string>
<string name="unable_to_retry_build">Unable to retry job</string>
<string name="unable_to_erase_build">Unable to erase job</string>
<string name="unable_to_cancel_build">Unable to cancel job</string>
<string name="unable_to_load_build">Unable to load job</string>
<string-array name="build_tabs">
<item>Details</item>
<item>Log</item>
</string-array>
<string name="build_pipeline">Pipeline: #%1$s</string>
<string name="build_name">Name: %1$s</string>
<string name="build_stage">Stage: %1$s</string>
<string name="build_ref">Ref: %1$s</string>
<string name="build_status">Status: %1$s</string>
<string name="build_duration">Duration: %1$s</string>
@@ -462,4 +512,6 @@
<string name="no_branches">No branches</string>
<string name="no_tags">No tags</string>
<string name="fetching_some_details">Fetching some details</string>
<string name="title_activity_fullscreen_image">FullscreenImageActivity</string>
</resources>
\ No newline at end of file
app/src/main/res/values/styles.xml
+ 13
− 2
View file @ 35eba923
@@ -6,14 +6,15 @@
<item name="colorPrimary">@color/main_blue</item>
<item name="colorAccent">@color/yellow</item>
<item name="colorPrimaryDark">@color/main_blue_darker</item>
<item name="android:navigationBarColor" tools:targetApi="lollipop">@color/main_blue_darker</item>
<item name="android:navigationBarColor" tools:targetApi="lollipop">@color/main_blue_darker
</item>
<item name="android:windowContentTransitions" tools:ignore="NewApi">true</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="dialogTheme">@style/AppDialogTheme</item>
<item name="alertDialogTheme">@style/AppDialogTheme</item>
</style>
 
<style name="Activity" parent="AppTheme" />
<style name="Activity" parent="AppTheme"/>
 
<style name="Activity.Login">
<item name="android:windowBackground">?attr/colorPrimary</item>
@@ -71,4 +72,14 @@
<item name="android:foreground">?attr/selectableItemBackground</item>
</style>
 
<style name="FullscreenTheme" parent="AppTheme">
<item name="android:actionBarStyle">@style/FullscreenActionBarStyle</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="android:windowBackground">@null</item>
</style>
<style name="FullscreenActionBarStyle" parent="Widget.AppCompat.ActionBar">
<item name="android:background">@color/black_overlay</item>
</style>
</resources>
\ No newline at end of file
app/src/normal/java/com/commit451/gitlab/util/CrashlyticsWtfTree.java deleted 100644 → 0
+ 0
− 20
View file @ 8675a0f4
package com.commit451.gitlab.util;
import android.util.Log;
import com.crashlytics.android.Crashlytics;
import timber.log.Timber;
/**
* Logs all {@link timber.log.Timber#wtf(String, Object...)} calls to Crashlytics
*/
public class CrashlyticsWtfTree extends Timber.Tree {
@Override
protected void log(int priority, String tag, String message, Throwable t) {
if (priority == Log.ASSERT) {
Crashlytics.log(Log.ASSERT, tag, message);
}
}
}
app/src/normal/java/com/commit451/gitlab/util/CrashlyticsWtfTree.kt 0 → 100644
+ 17
− 0
View file @ 35eba923
package com.commit451.gitlab.util
import android.util.Log
import com.crashlytics.android.Crashlytics
import timber.log.Timber
/**
* Logs all [timber.log.Timber.wtf] calls to Crashlytics
*/
class CrashlyticsWtfTree : Timber.Tree() {
override fun log(priority: Int, tag: String?, message: String?, t: Throwable?) {
if (priority == Log.ASSERT) {
Crashlytics.log(Log.ASSERT, tag, message)
}
}
}
app/src/normal/java/com/commit451/gitlab/util/FabricUtil.java deleted 100644 → 0
+ 0
− 24
View file @ 8675a0f4
package com.commit451.gitlab.util;
import android.content.Context;
import android.support.annotation.NonNull;
import com.commit451.gitlab.BuildConfig;
import com.crashlytics.android.Crashlytics;
import io.fabric.sdk.android.Fabric;
import timber.log.Timber;
/**
* Enables Fabric
*/
public class FabricUtil {
public static void init(@NonNull Context context) {
// Start crashlytics if enabled
if (!BuildConfig.DEBUG) {
Fabric.with(context, new Crashlytics());
Timber.plant(new CrashlyticsWtfTree());
}
}
}
app/src/normal/java/com/commit451/gitlab/util/FabricUtil.kt 0 → 100644
+ 23
− 0
View file @ 35eba923
package com.commit451.gitlab.util
import android.content.Context
import com.commit451.gitlab.BuildConfig
import com.crashlytics.android.Crashlytics
import io.fabric.sdk.android.Fabric
import timber.log.Timber
/**
* Enables Fabric
*/
object FabricUtil {
fun init(context: Context) {
// Start crashlytics if enabled
if (!BuildConfig.DEBUG) {
Fabric.with(context, Crashlytics())
Timber.plant(CrashlyticsWtfTree())
}
}
}
app/src/test/java/com/commit451/gitlab/TestUtil.kt
+ 3
− 3
View file @ 35eba923
@@ -35,16 +35,16 @@ object TestUtil {
.login(request)
.blockingGet()
assertTrue(loginResponse.isSuccessful)
assertNotNull(loginResponse.body().privateToken)
assertNotNull(loginResponse.body()!!.privateToken)
//attach the newly retrieved private token
account.privateToken = loginResponse.body().privateToken
account.privateToken = loginResponse.body()!!.privateToken
return gitLab
}
 
@Throws(Exception::class)
fun assertRetrofitResponseSuccess(response: Response<*>) {
if (!response.isSuccessful) {
Assert.assertTrue(response.errorBody().string(), response.isSuccessful)
Assert.assertTrue(response.errorBody()!!.string(), response.isSuccessful)
}
}
}
build.gradle
+ 3
− 2
View file @ 35eba923
@@ -2,13 +2,13 @@
apply plugin: 'com.github.ben-manes.versions'
apply plugin: 'com.commit451.updatewrapper'
buildscript {
ext.kotlinVersion = '1.1.1'
ext.kotlinVersion = '1.1.2-3'
repositories {
jcenter()
maven { url "https://jitpack.io" }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:2.3.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
//check with ./gradlew dependencyUpdates
classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
@@ -20,6 +20,7 @@ allprojects {
repositories {
jcenter()
maven { url "https://jitpack.io" }
maven { url "https://maven.google.com" }
}
}
 
gradle.properties
+ 3
− 4
View file @ 35eba923
# Project-wide Gradle settings.
 
# IDE (e.g. Android Studio) users:
# Settings specified in this file will override any Gradle settings
# configured through the IDE.
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
 
# 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
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx1536m
 
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment