Skip to content

Commit 1accb58

Browse files
committedJul 2, 2020
Apdate to AGP 4.2c3.
Also removed some rogue gradle files. Change-Id: If4c0b603cf21e077d639682e0d29c8c7e4df981d
1 parent f75013e commit 1accb58

File tree

8 files changed

+23
-279
lines changed

8 files changed

+23
-279
lines changed
 

‎JetNews/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ apply plugin: 'com.android.application'
1818
apply plugin: 'kotlin-android'
1919

2020
android {
21-
compileSdkVersion 29
21+
compileSdkVersion 30
2222
defaultConfig {
2323
applicationId 'com.example.jetnews'
2424
minSdkVersion 21
25-
targetSdkVersion 29
25+
targetSdkVersion 30
2626
versionCode 1
2727
versionName '1.0'
2828
vectorDrawables.useSupportLibrary = true
@@ -77,7 +77,7 @@ dependencies {
7777

7878
implementation "androidx.ui:ui-livedata:$compose_version"
7979

80-
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0-alpha04"
80+
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0-alpha05"
8181

8282
androidTestImplementation 'junit:junit:4.13'
8383
androidTestImplementation 'androidx.test:rules:1.2.0'

‎JetNews/app/src/main/java/com/example/jetnews/ui/JetnewsApp.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.ui.core.Alignment
2222
import androidx.ui.core.Modifier
2323
import androidx.ui.foundation.Image
2424
import androidx.ui.foundation.Text
25+
import androidx.ui.graphics.Color
2526
import androidx.ui.graphics.ColorFilter
2627
import androidx.ui.graphics.vector.VectorAsset
2728
import androidx.ui.layout.Arrangement
@@ -162,7 +163,7 @@ private fun DrawerButton(
162163
val backgroundColor = if (isSelected) {
163164
colors.primary.copy(alpha = 0.12f)
164165
} else {
165-
colors.surface
166+
Color.Transparent
166167
}
167168

168169
val surfaceModifier = modifier

‎JetNews/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ buildscript {
2323
jcenter()
2424
}
2525
dependencies {
26-
classpath 'com.android.tools.build:gradle:4.2.0-alpha02'
26+
classpath 'com.android.tools.build:gradle:4.2.0-alpha03'
2727
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2828
}
2929
}

‎JetNews/gradle.properties

+17-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
1-
## For more details on how to configure your build environment visit
1+
# Project-wide Gradle settings.
2+
# IDE (e.g. Android Studio) users:
3+
# Gradle settings configured through the IDE *will override*
4+
# any settings specified in this file.
5+
# For more details on how to configure your build environment visit
26
# http://www.gradle.org/docs/current/userguide/build_environment.html
3-
#
7+
48
# Specifies the JVM arguments used for the daemon process.
59
# The setting is particularly useful for tweaking memory settings.
6-
# Default value: -Xmx1024m -XX:MaxPermSize=256m
7-
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
8-
#
9-
# When configured, Gradle will run in incubating parallel mode.
10-
# This option should only be used with decoupled projects. More details, visit
11-
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
12-
# org.gradle.parallel=true
13-
#Thu Apr 02 12:49:33 CEST 2020
14-
android.enableJetifier=true
10+
org.gradle.jvmargs=-Xmx2048m
11+
12+
org.gradle.configureondemand=true
13+
org.gradle.caching=true
14+
org.gradle.parallel=true
15+
16+
# AndroidX package structure to make it clearer which packages are bundled with the
17+
# Android operating system, and which are packaged with your app's APK
18+
# https://developer.android.com/topic/libraries/support-library/androidx-rn
1519
android.useAndroidX=true
20+
21+
# Kotlin code style for this project: "official" or "obsolete":
1622
kotlin.code.style=official
17-
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"

‎gradle/wrapper/gradle-wrapper.jar

-53.1 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

-6
This file was deleted.

‎gradlew

-172
This file was deleted.

‎gradlew.bat

-84
This file was deleted.

0 commit comments

Comments
 (0)