Skip to content

Commit 779cf9e

Browse files
christofferqachristofferqa
committedNov 11, 2020
Enable R8 for all sample apps
·
v1.0.0-alpha10v1.0.0-alpha08
1 parent 1239fac commit 779cf9e

File tree

31 files changed

+104
-31
lines changed

31 files changed

+104
-31
lines changed
 

‎Crane/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ android {
6565
}
6666

6767
release {
68-
minifyEnabled false
68+
minifyEnabled true
6969
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
7070
}
7171
}

‎Crane/app/proguard-rules.pro

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
# Uncomment this to preserve the line number information for
1616
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
17+
-keepattributes SourceFile,LineNumberTable
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
-renamesourcefileattribute SourceFile
22+
23+
# Repackage classes into the top-level.
24+
-repackageclasses

‎Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ object Libs {
3737
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
3838

3939
object Coroutines {
40-
private const val version = "1.4.0"
40+
private const val version = "1.4.1"
4141
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
4242
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
4343
}

‎Crane/gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,6 @@ android.enableJetifier=true
4040

4141
# Kotlin code style for this project: "official" or "obsolete":
4242
kotlin.code.style=official
43+
44+
# Enable R8 full mode.
45+
android.enableR8.fullMode=true

‎JetNews/app/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545
}
4646

4747
release {
48-
minifyEnabled false
48+
minifyEnabled true
4949
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
5050
}
5151
}
@@ -77,6 +77,7 @@ android {
7777

7878
dependencies {
7979
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
80+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
8081

8182
implementation "androidx.compose.runtime:runtime:$compose_version"
8283
implementation "androidx.compose.ui:ui:$compose_version"

‎JetNews/app/proguard-rules.pro

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
# Uncomment this to preserve the line number information for
1616
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
17+
-keepattributes SourceFile,LineNumberTable
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
-renamesourcefileattribute SourceFile
22+
23+
# Repackage classes into the top-level.
24+
-repackageclasses

‎JetNews/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
buildscript {
1818
ext.kotlin_version = '1.4.10'
1919
ext.compose_version = '1.0.0-SNAPSHOT'
20+
ext.coroutines_version = '1.4.1'
2021

2122
repositories {
2223
google()

‎JetNews/gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ android.useAndroidX=true
3737

3838
# Kotlin code style for this project: "official" or "obsolete":
3939
kotlin.code.style=official
40+
41+
# Enable R8 full mode.
42+
android.enableR8.fullMode=true

‎Jetcaster/app/proguard-rules.pro

+19-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,25 @@
1414

1515
# Uncomment this to preserve the line number information for
1616
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
17+
-keepattributes SourceFile,LineNumberTable
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
-renamesourcefileattribute SourceFile
22+
23+
# Repackage classes into the top-level.
24+
-repackageclasses
25+
26+
# Rome reflectively loads classes referenced in com/rometools/rome/rome.properties.
27+
-adaptresourcefilecontents com/rometools/rome/rome.properties
28+
-keep,allowobfuscation class * implements com.rometools.rome.feed.synd.Converter
29+
-keep,allowobfuscation class * implements com.rometools.rome.io.ModuleParser
30+
-keep,allowobfuscation class * implements com.rometools.rome.io.WireFeedParser
31+
32+
# Disable warnings for missing classes from OkHttp.
33+
-dontwarn org.conscrypt.ConscryptHostnameVerifier
34+
35+
# Disable warnings for missing classes from JDOM.
36+
-dontwarn org.jaxen.DefaultNavigator
37+
-dontwarn org.jaxen.NamespaceContext
38+
-dontwarn org.jaxen.VariableContext

‎Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ object Libs {
4242
}
4343

4444
object Coroutines {
45-
private const val version = "1.4.0"
45+
private const val version = "1.4.1"
4646
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
4747
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
4848
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
4949
}
5050

5151
object OkHttp {
52-
private const val version = "4.7.2"
52+
private const val version = "4.9.0"
5353
const val okhttp = "com.squareup.okhttp3:okhttp:$version"
5454
const val logging = "com.squareup.okhttp3:logging-interceptor:$version"
5555
}

‎Jetcaster/gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ android.useAndroidX=true
3737

3838
# Kotlin code style for this project: "official" or "obsolete":
3939
kotlin.code.style=official
40+
41+
# Enable R8 full mode.
42+
android.enableR8.fullMode=true

‎Jetchat/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ android {
5151
}
5252

5353
release {
54-
minifyEnabled false
54+
minifyEnabled true
5555
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
5656
}
5757
}

‎Jetchat/app/proguard-rules.pro

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
# Uncomment this to preserve the line number information for
1616
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
17+
-keepattributes SourceFile,LineNumberTable
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
-renamesourcefileattribute SourceFile
22+
23+
# Repackage classes into the top-level.
24+
-repackageclasses

‎Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object Libs {
3636
}
3737

3838
object Coroutines {
39-
private const val version = "1.3.9"
39+
private const val version = "1.4.1"
4040
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
4141
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
4242
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"

‎Jetchat/gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ android.useAndroidX=true
3737

3838
# Kotlin code style for this project: "official" or "obsolete":
3939
kotlin.code.style=official
40+
41+
# Enable R8 full mode.
42+
android.enableR8.fullMode=true

‎Jetsnack/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android {
5050
}
5151

5252
release {
53-
minifyEnabled false
53+
minifyEnabled true
5454
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
5555
}
5656
}
@@ -77,8 +77,8 @@ android {
7777
}
7878

7979
dependencies {
80-
8180
implementation Libs.Kotlin.stdlib
81+
implementation Libs.Coroutines.android
8282

8383
implementation Libs.Coroutines.core
8484

‎Jetsnack/app/proguard-rules.pro

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
# Uncomment this to preserve the line number information for
1616
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
17+
-keepattributes SourceFile,LineNumberTable
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
-renamesourcefileattribute SourceFile
22+
23+
# Repackage classes into the top-level.
24+
-repackageclasses

‎Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ object Libs {
3737
}
3838

3939
object Coroutines {
40-
private const val version = "1.4.0"
40+
private const val version = "1.4.1"
4141
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
4242
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
4343
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"

‎Jetsnack/gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ android.useAndroidX=true
3737

3838
# Kotlin code style for this project: "official" or "obsolete":
3939
kotlin.code.style=official
40+
41+
# Enable R8 full mode.
42+
android.enableR8.fullMode=true

‎Jetsurvey/app/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ android {
4949
}
5050

5151
release {
52-
minifyEnabled false
52+
minifyEnabled true
5353
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
5454
}
5555
}
@@ -87,6 +87,7 @@ android {
8787

8888
dependencies {
8989
implementation Libs.Kotlin.stdlib
90+
implementation Libs.Coroutines.android
9091

9192
implementation Libs.AndroidX.coreKtx
9293
implementation Libs.AndroidX.appcompat

‎Jetsurvey/app/proguard-rules.pro

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
# Uncomment this to preserve the line number information for
1616
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
17+
-keepattributes SourceFile,LineNumberTable
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
-renamesourcefileattribute SourceFile
22+
23+
# Repackage classes into the top-level.
24+
-repackageclasses

‎Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt

+7
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ object Libs {
4040
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
4141
}
4242

43+
object Coroutines {
44+
private const val version = "1.4.1"
45+
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
46+
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
47+
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
48+
}
49+
4350
object AndroidX {
4451
const val appcompat = "androidx.appcompat:appcompat:1.2.0-rc01"
4552
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"

‎Jetsurvey/gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ android.useAndroidX=true
3737

3838
# Kotlin code style for this project: "official" or "obsolete":
3939
kotlin.code.style=official
40+
41+
# Enable R8 full mode.
42+
android.enableR8.fullMode=true

‎Owl/app/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android {
5050
}
5151

5252
release {
53-
minifyEnabled false
53+
minifyEnabled true
5454
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
5555
}
5656
}
@@ -78,6 +78,7 @@ android {
7878

7979
dependencies {
8080
implementation Libs.Kotlin.stdlib
81+
implementation Libs.Coroutines.android
8182

8283
implementation Libs.AndroidX.coreKtx
8384

‎Owl/app/proguard-rules.pro

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
# Uncomment this to preserve the line number information for
1616
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
17+
-keepattributes SourceFile,LineNumberTable
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
-renamesourcefileattribute SourceFile
22+
23+
# Repackage classes into the top-level.
24+
-repackageclasses

‎Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ object Libs {
3838
}
3939

4040
object Coroutines {
41-
private const val version = "1.4.0"
41+
private const val version = "1.4.1"
4242
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
4343
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
4444
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"

‎Owl/gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ android.useAndroidX=true
3737

3838
# Kotlin code style for this project: "official" or "obsolete":
3939
kotlin.code.style=official
40+
41+
# Enable R8 full mode.
42+
android.enableR8.fullMode=true

‎Rally/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ android {
5151
}
5252

5353
release {
54-
minifyEnabled false
54+
minifyEnabled true
5555
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
5656
}
5757
}

‎Rally/app/proguard-rules.pro

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
# Uncomment this to preserve the line number information for
1616
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
17+
-keepattributes SourceFile,LineNumberTable
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
-renamesourcefileattribute SourceFile
22+
23+
# Repackage classes into the top-level.
24+
-repackageclasses

‎Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object Libs {
3636
}
3737

3838
object Coroutines {
39-
private const val version = "1.3.9"
39+
private const val version = "1.4.1"
4040
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
4141
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
4242
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"

‎Rally/gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ android.useAndroidX=true
3737

3838
# Kotlin code style for this project: "official" or "obsolete":
3939
kotlin.code.style=official
40+
41+
# Enable R8 full mode.
42+
android.enableR8.fullMode=true

0 commit comments

Comments
 (0)