Skip to content

Commit

Permalink
Disable jetifier
Browse files Browse the repository at this point in the history
  • Loading branch information
@keyboardsurfer
keyboardsurfer committed Sep 11, 2020
1 parent 06046c0 commit 076962f
Show file tree
Hide file tree
Showing 12 changed files with 54 additions and 42 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ executors:
- image: circleci/android:api-29
working_directory: ~/plaid
environment:
JAVA_TOOL_OPTIONS: "-Xmx2048m"
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
JAVA_TOOL_OPTIONS: "-Xmx4096m"
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=4"
TERM: dumb

plaid-gcloud-executor:
Expand Down
6 changes: 3 additions & 3 deletions about/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ android {
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}

dataBinding {
enabled true
buildFeatures {
dataBinding true
}

compileOptions {
Expand All @@ -51,7 +51,7 @@ dependencies {
implementation project(':bypass')

implementation "androidx.viewpager2:viewpager2:${versions.viewPager2}"
implementation "com.android.support:customtabs:${versions.supportLibrary}"
implementation "androidx.browser:browser:${versions.browser}"
implementation "com.github.bumptech.glide:glide:${versions.glide}"

kapt "com.google.dagger:dagger-compiler:${versions.dagger}"
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ android {
]
}

dataBinding {
enabled true
buildFeatures {
dataBinding true
}

buildTypes {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/plaidapp/ui/HomeViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class HomeViewModel(
positions.add(i)
}

val scrollToPosition = positions.max()
val scrollToPosition = positions.maxOrNull()
return if (scrollToPosition == null) {
null
} else {
Expand Down
36 changes: 19 additions & 17 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,46 +21,48 @@ buildscript { scriptHandler ->
'compileSdk' : 29,
'minSdk' : 23,
'targetSdk' : 29,
'appcompat' : '1.1.0-rc01',
'androidx' : '1.0.0',
'appcompat' : '1.1.0',
'androidx' : '1.1.0',
'androidxCollection' : '1.0.0',
'androidxArch' : '2.0.0',
'constraintLayout' : '2.0.0-alpha2',
'coreKtx' : '1.2.0-alpha03',
'browser' : '1.2.0',
'constraintLayout' : '2.0.1',
'coreKtx' : '1.2.0',
'coroutines' : '1.3.0',
'crashlytics' : '2.10.1',
'dagger' : '2.23.2',
'espresso' : '3.1.0-beta02',
'dynamicanimation' : '1.0.0',
'espresso' : '3.1.0',
'extJunit' : '1.1.0',
'fabric' : '1.28.0',
'firebase' : '17.0.0',
'glide' : '4.9.0',
'firebase' : '17.5.0',
'glide' : '4.11.0',
'googleServices' : '4.3.0',
'gson' : '2.8.5',
'jsoup' : '1.11.3',
'junit' : '4.12',
'kotlin' : '1.3.61',
'kotlin' : '1.4.0',
'ktlint' : '0.36.0',
'legacyCoreUtils' : '1.0.0',
'lifecycle' : '2.2.0-alpha03',
'material' : '1.1.0-alpha05',
'lifecycle' : '2.2.0',
'material' : '1.1.0',
'mockito' : '2.23.0',
'mockito_kotlin' : '2.0.0-RC3',
'mockito_kotlin' : '2.0.0',
'okhttp' : '4.0.0',
'palette' : '1.0.0',
'retrofit' : '2.6.0',
'room' : '2.2.1',
'supportLibrary' : '28.0.0',
'test_rules' : '1.1.0-beta02',
'test_runner' : '1.1.0-beta02',
'ui_automator' : '2.2.0-beta02',
'room' : '2.2.5',
'test_rules' : '1.1.0',
'test_runner' : '1.1.0',
'ui_automator' : '2.2.0',
'viewPager2' : '1.0.0'
]
ext.names = [
'applicationId': 'io.plaidapp'
]

dependencies {
classpath 'com.android.tools.build:gradle:4.0.0-beta05'
classpath 'com.android.tools.build:gradle:4.2.0-alpha08'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "com.google.gms:google-services:${versions.googleServices}"
classpath "io.fabric.tools:gradle:${versions.fabric}"
Expand Down
13 changes: 7 additions & 6 deletions core/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ android {
}
}

dataBinding {
enabled true
buildFeatures {
dataBinding true
}

buildTypes {
Expand All @@ -65,18 +65,19 @@ android {
}

packagingOptions {
exclude 'META-INF/core_debug.kotlin_module'
merge 'META-INF/core_debug.kotlin_module'
merge 'META-INF/AL2.0'
}
}

dependencies {
implementation project(':bypass')
implementation "com.google.code.gson:gson:${versions.gson}"
implementation "androidx.browser:browser:${versions.androidx}"
implementation "androidx.browser:browser:${versions.browser}"
implementation "androidx.room:room-runtime:${versions.room}"
implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
implementation "com.android.support:palette-v7:${versions.supportLibrary}"
implementation "com.android.support:support-dynamic-animation:${versions.supportLibrary}"
implementation "androidx.palette:palette:${versions.palette}"
implementation "androidx.dynamicanimation:dynamicanimation:${versions.dynamicanimation}"
implementation "com.github.bumptech.glide:glide:${versions.glide}"
implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
implementation "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}"
Expand Down
6 changes: 3 additions & 3 deletions designernews/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ android {
}
}

dataBinding {
enabled true
buildFeatures {
dataBinding true
}

compileOptions {
Expand All @@ -59,7 +59,7 @@ dependencies {
implementation project(':bypass')

implementation "androidx.room:room-ktx:${versions.room}"
implementation "com.android.support:customtabs:${versions.supportLibrary}"
implementation "androidx.browser:browser:${versions.browser}"
implementation "com.github.bumptech.glide:glide:${versions.glide}"

kapt "com.google.dagger:dagger-compiler:${versions.dagger}"
Expand Down
8 changes: 4 additions & 4 deletions dribbble/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ android {
manifestPlaceholders = [filesAuthority: filesAuthorityValue]
}

dataBinding {
enabled true
buildFeatures {
dataBinding true
}

compileOptions {
Expand All @@ -50,8 +50,8 @@ dependencies {
implementation project(':app')
implementation project(':core')

implementation "com.android.support:customtabs:${versions.supportLibrary}"
implementation "com.android.support:palette-v7:${versions.supportLibrary}"
implementation "androidx.browser:browser:${versions.browser}"
implementation "androidx.palette:palette:${versions.palette}"
implementation "com.github.bumptech.glide:recyclerview-integration:${versions.glide}"

kapt "com.google.dagger:dagger-compiler:${versions.dagger}"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ org.gradle.jvmargs=-Xmx1536m
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.enableJetifier=false

# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
Expand Down
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Mon Sep 07 21:18:25 BST 2020
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-rc-6-bin.zip
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
6 changes: 5 additions & 1 deletion repositories.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ repositories {
includeGroupByRegex "androidx.*"
includeGroup "android.arch.lifecycle"
includeGroup "android.arch.core"
includeGroup "com.google.firebase"
includeGroup "com.google.android.gms"
includeGroup "com.google.android.material"
includeGroup "com.google.firebase"
includeGroup "com.google.gms"
includeGroup "com.google.testing.platform"
includeGroup "zipflinger"
}
}
Expand All @@ -34,10 +35,13 @@ repositories {
includeGroup "commons-codec"
includeGroup "commons-logging"
includeGroup "it.unimi.dsi"
includeGroup "jakarta.activation"
includeGroup "jakarta.xml.bind"
includeGroup "junit"
includeGroup "me.eugeniomarletti.kotlin.metadata"
includeGroup "net.bytebuddy"
includeGroup "net.java"
includeGroup "net.java.dev.jna"
includeGroup "org.abego.treelayout"
includeGroup "org.antlr"
includeGroup "org.bouncycastle"
Expand Down
4 changes: 4 additions & 0 deletions third_party/bypass/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ android {
minifyEnabled false
}
}

packagingOptions {
merge 'META-INF/AL2.0'
}
}

dependencies {
Expand Down

0 comments on commit 076962f

Please sign in to comment.