diff --git a/Crane/app/build.gradle b/Crane/app/build.gradle index d2eaf61750..ad47134717 100644 --- a/Crane/app/build.gradle +++ b/Crane/app/build.gradle @@ -65,7 +65,7 @@ android { } release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/Crane/app/proguard-rules.pro b/Crane/app/proguard-rules.pro index f1b424510d..4cb94585a0 100644 --- a/Crane/app/proguard-rules.pro +++ b/Crane/app/proguard-rules.pro @@ -14,8 +14,11 @@ # Uncomment this to preserve the line number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile +-renamesourcefileattribute SourceFile + +# Repackage classes into the top-level. +-repackageclasses diff --git a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt b/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt index 789bcd4619..33cd4c06bd 100644 --- a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt +++ b/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt @@ -37,7 +37,7 @@ object Libs { const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version" object Coroutines { - private const val version = "1.4.0" + private const val version = "1.4.1" const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version" const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version" } diff --git a/Crane/gradle.properties b/Crane/gradle.properties index 338e94c7f3..5e5ee02b5e 100644 --- a/Crane/gradle.properties +++ b/Crane/gradle.properties @@ -40,3 +40,6 @@ android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official + +# Enable R8 full mode. +android.enableR8.fullMode=true diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle index 9b6c553779..ea2263ab1e 100644 --- a/JetNews/app/build.gradle +++ b/JetNews/app/build.gradle @@ -45,7 +45,7 @@ android { } release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -77,6 +77,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" implementation "androidx.compose.runtime:runtime:$compose_version" implementation "androidx.compose.ui:ui:$compose_version" diff --git a/JetNews/app/proguard-rules.pro b/JetNews/app/proguard-rules.pro index f1b424510d..4cb94585a0 100644 --- a/JetNews/app/proguard-rules.pro +++ b/JetNews/app/proguard-rules.pro @@ -14,8 +14,11 @@ # Uncomment this to preserve the line number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile +-renamesourcefileattribute SourceFile + +# Repackage classes into the top-level. +-repackageclasses diff --git a/JetNews/build.gradle b/JetNews/build.gradle index f7cf7eefa1..8b79dfe2ad 100644 --- a/JetNews/build.gradle +++ b/JetNews/build.gradle @@ -17,6 +17,7 @@ buildscript { ext.kotlin_version = '1.4.10' ext.compose_version = '1.0.0-SNAPSHOT' + ext.coroutines_version = '1.4.1' repositories { google() diff --git a/JetNews/gradle.properties b/JetNews/gradle.properties index 9299bc6d0f..b2d834ce9c 100644 --- a/JetNews/gradle.properties +++ b/JetNews/gradle.properties @@ -37,3 +37,6 @@ android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official + +# Enable R8 full mode. +android.enableR8.fullMode=true diff --git a/Jetcaster/app/proguard-rules.pro b/Jetcaster/app/proguard-rules.pro index 481bb43481..cdd67acb1a 100644 --- a/Jetcaster/app/proguard-rules.pro +++ b/Jetcaster/app/proguard-rules.pro @@ -14,8 +14,25 @@ # Uncomment this to preserve the line number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +-renamesourcefileattribute SourceFile + +# Repackage classes into the top-level. +-repackageclasses + +# Rome reflectively loads classes referenced in com/rometools/rome/rome.properties. +-adaptresourcefilecontents com/rometools/rome/rome.properties +-keep,allowobfuscation class * implements com.rometools.rome.feed.synd.Converter +-keep,allowobfuscation class * implements com.rometools.rome.io.ModuleParser +-keep,allowobfuscation class * implements com.rometools.rome.io.WireFeedParser + +# Disable warnings for missing classes from OkHttp. +-dontwarn org.conscrypt.ConscryptHostnameVerifier + +# Disable warnings for missing classes from JDOM. +-dontwarn org.jaxen.DefaultNavigator +-dontwarn org.jaxen.NamespaceContext +-dontwarn org.jaxen.VariableContext diff --git a/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt b/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt index 8b275cf407..b3a5b0c4c5 100644 --- a/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt +++ b/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt @@ -42,14 +42,14 @@ object Libs { } object Coroutines { - private const val version = "1.4.0" + private const val version = "1.4.1" const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version" const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version" } object OkHttp { - private const val version = "4.7.2" + private const val version = "4.9.0" const val okhttp = "com.squareup.okhttp3:okhttp:$version" const val logging = "com.squareup.okhttp3:logging-interceptor:$version" } diff --git a/Jetcaster/gradle.properties b/Jetcaster/gradle.properties index 646f68d67b..18038533b3 100644 --- a/Jetcaster/gradle.properties +++ b/Jetcaster/gradle.properties @@ -37,3 +37,6 @@ android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official + +# Enable R8 full mode. +android.enableR8.fullMode=true diff --git a/Jetchat/app/build.gradle b/Jetchat/app/build.gradle index e29b6ea069..df88591956 100644 --- a/Jetchat/app/build.gradle +++ b/Jetchat/app/build.gradle @@ -51,7 +51,7 @@ android { } release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/Jetchat/app/proguard-rules.pro b/Jetchat/app/proguard-rules.pro index 481bb43481..4cb94585a0 100644 --- a/Jetchat/app/proguard-rules.pro +++ b/Jetchat/app/proguard-rules.pro @@ -14,8 +14,11 @@ # Uncomment this to preserve the line number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +-renamesourcefileattribute SourceFile + +# Repackage classes into the top-level. +-repackageclasses diff --git a/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt b/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt index eab5280c2d..9fe86ef241 100644 --- a/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt +++ b/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt @@ -36,7 +36,7 @@ object Libs { } object Coroutines { - private const val version = "1.3.9" + private const val version = "1.4.1" const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version" const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version" diff --git a/Jetchat/gradle.properties b/Jetchat/gradle.properties index 9299bc6d0f..b2d834ce9c 100644 --- a/Jetchat/gradle.properties +++ b/Jetchat/gradle.properties @@ -37,3 +37,6 @@ android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official + +# Enable R8 full mode. +android.enableR8.fullMode=true diff --git a/Jetsnack/app/build.gradle b/Jetsnack/app/build.gradle index 6e4f500c12..faf775cca4 100644 --- a/Jetsnack/app/build.gradle +++ b/Jetsnack/app/build.gradle @@ -50,7 +50,7 @@ android { } release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -77,8 +77,8 @@ android { } dependencies { - implementation Libs.Kotlin.stdlib + implementation Libs.Coroutines.android implementation Libs.Coroutines.core diff --git a/Jetsnack/app/proguard-rules.pro b/Jetsnack/app/proguard-rules.pro index 481bb43481..4cb94585a0 100644 --- a/Jetsnack/app/proguard-rules.pro +++ b/Jetsnack/app/proguard-rules.pro @@ -14,8 +14,11 @@ # Uncomment this to preserve the line number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +-renamesourcefileattribute SourceFile + +# Repackage classes into the top-level. +-repackageclasses diff --git a/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt b/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt index d4ac591360..d709f7b38b 100644 --- a/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt +++ b/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt @@ -37,7 +37,7 @@ object Libs { } object Coroutines { - private const val version = "1.4.0" + private const val version = "1.4.1" const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version" const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version" diff --git a/Jetsnack/gradle.properties b/Jetsnack/gradle.properties index 9299bc6d0f..b2d834ce9c 100644 --- a/Jetsnack/gradle.properties +++ b/Jetsnack/gradle.properties @@ -37,3 +37,6 @@ android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official + +# Enable R8 full mode. +android.enableR8.fullMode=true diff --git a/Jetsurvey/app/build.gradle b/Jetsurvey/app/build.gradle index c5a801e5b9..8d063a4ca6 100644 --- a/Jetsurvey/app/build.gradle +++ b/Jetsurvey/app/build.gradle @@ -49,7 +49,7 @@ android { } release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -87,6 +87,7 @@ android { dependencies { implementation Libs.Kotlin.stdlib + implementation Libs.Coroutines.android implementation Libs.AndroidX.coreKtx implementation Libs.AndroidX.appcompat diff --git a/Jetsurvey/app/proguard-rules.pro b/Jetsurvey/app/proguard-rules.pro index f1b424510d..4cb94585a0 100644 --- a/Jetsurvey/app/proguard-rules.pro +++ b/Jetsurvey/app/proguard-rules.pro @@ -14,8 +14,11 @@ # Uncomment this to preserve the line number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile +-renamesourcefileattribute SourceFile + +# Repackage classes into the top-level. +-repackageclasses diff --git a/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt b/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt index cbee398b48..0e72423c21 100644 --- a/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt +++ b/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt @@ -40,6 +40,13 @@ object Libs { const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version" } + object Coroutines { + private const val version = "1.4.1" + const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" + const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version" + const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version" + } + object AndroidX { const val appcompat = "androidx.appcompat:appcompat:1.2.0-rc01" const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01" diff --git a/Jetsurvey/gradle.properties b/Jetsurvey/gradle.properties index 9299bc6d0f..b2d834ce9c 100644 --- a/Jetsurvey/gradle.properties +++ b/Jetsurvey/gradle.properties @@ -37,3 +37,6 @@ android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official + +# Enable R8 full mode. +android.enableR8.fullMode=true diff --git a/Owl/app/build.gradle b/Owl/app/build.gradle index 8472fcd065..8b13458e19 100644 --- a/Owl/app/build.gradle +++ b/Owl/app/build.gradle @@ -50,7 +50,7 @@ android { } release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -78,6 +78,7 @@ android { dependencies { implementation Libs.Kotlin.stdlib + implementation Libs.Coroutines.android implementation Libs.AndroidX.coreKtx diff --git a/Owl/app/proguard-rules.pro b/Owl/app/proguard-rules.pro index f1b424510d..4cb94585a0 100644 --- a/Owl/app/proguard-rules.pro +++ b/Owl/app/proguard-rules.pro @@ -14,8 +14,11 @@ # Uncomment this to preserve the line number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile +-renamesourcefileattribute SourceFile + +# Repackage classes into the top-level. +-repackageclasses diff --git a/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt b/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt index b78ac08d10..e7e95c236e 100644 --- a/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt +++ b/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt @@ -38,7 +38,7 @@ object Libs { } object Coroutines { - private const val version = "1.4.0" + private const val version = "1.4.1" const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version" const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version" diff --git a/Owl/gradle.properties b/Owl/gradle.properties index 9299bc6d0f..b2d834ce9c 100644 --- a/Owl/gradle.properties +++ b/Owl/gradle.properties @@ -37,3 +37,6 @@ android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official + +# Enable R8 full mode. +android.enableR8.fullMode=true diff --git a/Rally/app/build.gradle b/Rally/app/build.gradle index c69a252413..c76a469642 100644 --- a/Rally/app/build.gradle +++ b/Rally/app/build.gradle @@ -51,7 +51,7 @@ android { } release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/Rally/app/proguard-rules.pro b/Rally/app/proguard-rules.pro index 481bb43481..4cb94585a0 100644 --- a/Rally/app/proguard-rules.pro +++ b/Rally/app/proguard-rules.pro @@ -14,8 +14,11 @@ # Uncomment this to preserve the line number information for # debugging stack traces. -#-keepattributes SourceFile,LineNumberTable +-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +-renamesourcefileattribute SourceFile + +# Repackage classes into the top-level. +-repackageclasses diff --git a/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt b/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt index 855d291ccb..21df5d2b3b 100644 --- a/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt +++ b/Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt @@ -36,7 +36,7 @@ object Libs { } object Coroutines { - private const val version = "1.3.9" + private const val version = "1.4.1" const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version" const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version" diff --git a/Rally/gradle.properties b/Rally/gradle.properties index 9299bc6d0f..b2d834ce9c 100644 --- a/Rally/gradle.properties +++ b/Rally/gradle.properties @@ -37,3 +37,6 @@ android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official + +# Enable R8 full mode. +android.enableR8.fullMode=true