Skip to content

Commit

Permalink
One time formatting of all kotlin files in the repository using ktfmt
Browse files Browse the repository at this point in the history
Summary: Ran ktfmt with ktfmt-0.40-jar-with-dependencies.jar by following the directions on https://facebookincubator.github.io/ktfmt/ (under the "Command line" tab)

Reviewed By: mingcaozhang

Differential Revision: D39827182

fbshipit-source-id: 94daa52854aee2311f675bdef2481ff259beb4a3
  • Loading branch information
jawwad authored and facebook-github-bot committed Sep 26, 2022
1 parent 88e0e81 commit 56db002
Show file tree
Hide file tree
Showing 15 changed files with 666 additions and 695 deletions.
34 changes: 17 additions & 17 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
repositories {
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") }
mavenCentral()
google()
}
repositories {
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") }
mavenCentral()
google()
}

dependencies {
classpath(Plugins.android_gradle)
classpath(Plugins.kotlin_gradle)
classpath(Plugins.dokka)
classpath(Plugins.jacoco)
}
dependencies {
classpath(Plugins.android_gradle)
classpath(Plugins.kotlin_gradle)
classpath(Plugins.dokka)
classpath(Plugins.jacoco)
}
}

allprojects {
repositories {
mavenCentral()
google()
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") }
maven { url = uri("https://jitpack.io") }
}
repositories {
mavenCentral()
google()
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") }
maven { url = uri("https://jitpack.io") }
}
}
8 changes: 2 additions & 6 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@

import org.gradle.kotlin.dsl.`kotlin-dsl`

plugins {
`kotlin-dsl`
}
plugins { `kotlin-dsl` }

repositories {
mavenCentral()
}
repositories { mavenCentral() }
39 changes: 26 additions & 13 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ object Versions {
const val acra = "5.5.0"
const val analytics = "4.+"
const val android_billingclient = "3.0.0"
const val android_installreferrer = "1.0" // there are issues with 1.1 regarding permissions, asks for unnecessary permissions
const val android_installreferrer =
"1.0" // there are issues with 1.1 regarding permissions, asks for unnecessary permissions
const val androidx = "1.1.0"
const val androidxActivity = "1.2.0"
const val androidxAnnotation = "1.1.0"
Expand Down Expand Up @@ -62,20 +63,26 @@ object Plugins {
object Libs {

// android
const val android_billingclient = "com.android.billingclient:billing:${Versions.android_billingclient}"
const val android_installreferrer = "com.android.installreferrer:installreferrer:${Versions.android_installreferrer}" //https://developer.android.com/google/play/installreferrer/library.html#java
const val android_billingclient =
"com.android.billingclient:billing:${Versions.android_billingclient}"
const val android_installreferrer =
"com.android.installreferrer:installreferrer:${Versions.android_installreferrer}" // https://developer.android.com/google/play/installreferrer/library.html#java
const val androidx_activity = "androidx.activity:activity:${Versions.androidxActivity}"
const val androidx_annotation = "androidx.annotation:annotation:${Versions.androidxAnnotation}"
const val androidx_appcompat = "androidx.appcompat:appcompat:${Versions.androidx}"
const val androidx_browser = "androidx.browser:browser:${Versions.androidxBrowser}"
const val androidx_cardview = "androidx.cardview:cardview:${Versions.androidxCardview}"
const val androidx_constraintlayout = "androidx.constraintlayout:constraintlayout:${Versions.androidxConstraintLayout}"
const val androidx_constraintlayout =
"androidx.constraintlayout:constraintlayout:${Versions.androidxConstraintLayout}"
const val androidx_core = "androidx.core:core:${Versions.androidxCore}"
const val androidx_core_ktx = "androidx.core:core-ktx:${Versions.androidxCoreKtx}"
const val androidx_espresso_core = "androidx.test.espresso:espresso-core:${Versions.androidxEspressoCore}"
const val androidx_espresso_core =
"androidx.test.espresso:espresso-core:${Versions.androidxEspressoCore}"
const val androidx_fragment = "androidx.fragment:fragment:${Versions.androidxFragment}"
const val androidx_legacy_support_v4 = "androidx.legacy:legacy-support-v4:${Versions.androidxLegacy}"
const val androidx_legacy_support_core_utils = "androidx.legacy:legacy-support-core-utils:${Versions.androidxLegacy}"
const val androidx_legacy_support_v4 =
"androidx.legacy:legacy-support-v4:${Versions.androidxLegacy}"
const val androidx_legacy_support_core_utils =
"androidx.legacy:legacy-support-core-utils:${Versions.androidxLegacy}"
const val androidx_recyclerview = "androidx.recyclerview:recyclerview:${Versions.androidx}"
const val androidx_test_core = "androidx.test:core:${Versions.androidxTest}"

Expand All @@ -84,12 +91,15 @@ object Libs {
const val dexmaker_mockito = "com.google.dexmaker:dexmaker-mockito:${Versions.dexmaker}"
const val firebase_bom = "com.google.firebase:firebase-bom:${Versions.firebaseBom}"
const val firebase_analytics = "com.google.firebase:firebase-analytics"
const val firebase_messaging = "com.google.firebase:firebase-messaging:${Versions.firebaseMessaging}"
const val firebase_messaging =
"com.google.firebase:firebase-messaging:${Versions.firebaseMessaging}"
const val gson = "com.google.code.gson:gson:${Versions.gson}"
const val guava = "com.google.guava:guava:${Versions.guava}"
const val material = "com.google.android.material:material:${Versions.material}"
const val play_services_auth = "com.google.android.gms:play-services-auth:${Versions.playServicesAuth}"
const val play_services_gcm = "com.google.android.gms:play-services-gcm:${Versions.playServicesGcm}"
const val play_services_auth =
"com.google.android.gms:play-services-auth:${Versions.playServicesAuth}"
const val play_services_gcm =
"com.google.android.gms:play-services-gcm:${Versions.playServicesGcm}"
const val zxing = "com.google.zxing:core:${Versions.zxing}"

// 1st-party
Expand All @@ -106,16 +116,19 @@ object Libs {
const val kotlin_stdlib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}"
const val kotlin_stdlib_jdk7 = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Versions.kotlin}"
const val kotlin_test_junit = "org.jetbrains.kotlin:kotlin-test-junit:${Versions.kotlin}"
const val leakcanary_android = "com.squareup.leakcanary:leakcanary-android:${Versions.leakcanaryAndroid}"
const val leakcanary_android =
"com.squareup.leakcanary:leakcanary-android:${Versions.leakcanaryAndroid}"
const val liquidcore = "com.github.LiquidPlayer:LiquidCore:${Versions.liquidcore}"
const val mockito_inline = "org.mockito:mockito-inline:${Versions.mockitoInline}"
const val mockito_kotlin = "org.mockito.kotlin:mockito-kotlin:${Versions.mockitoKotlin}"
const val mockwebserver = "com.squareup.okhttp3:mockwebserver:${Versions.mockwebserver}"
const val powermock_core = "org.powermock:powermock-core:${Versions.powerMock}"
const val powermock_api_mockito2 = "org.powermock:powermock-api-mockito2:${Versions.powerMock}"
const val powermock_junit4 = "org.powermock:powermock-module-junit4:${Versions.powerMock}"
const val powermock_junit4_rule = "org.powermock:powermock-module-junit4-rule:${Versions.powerMock}"
const val powermock_classloading_xstream = "org.powermock:powermock-classloading-xstream:${Versions.powerMock}"
const val powermock_junit4_rule =
"org.powermock:powermock-module-junit4-rule:${Versions.powerMock}"
const val powermock_classloading_xstream =
"org.powermock:powermock-classloading-xstream:${Versions.powerMock}"
const val robolectric = "org.robolectric:robolectric:${Versions.robolectric}"
const val testng = "org.testng:testng:${Versions.testng}"
}
47 changes: 23 additions & 24 deletions facebook-applinks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,50 +7,49 @@
*/

plugins {
id("com.android.library")
id("kotlin-android")
id("com.android.library")
id("kotlin-android")
}

group = "com.facebook.android"

extra["name"] = "Facebook-Applinks-Android-SDK"

extra["artifactId"] = "facebook-applinks"

extra["description"] = "Facebook Applinks Android SDK"

extra["url"] = "https://github.com/facebook/facebook-android-sdk"

dependencies {
// Facebook Dependencies
api(project(":facebook-core"))
// Support Dependencies
implementation(Libs.androidx_annotation)
implementation(Libs.androidx_legacy_support_core_utils)
// Facebook Dependencies
api(project(":facebook-core"))
// Support Dependencies
implementation(Libs.androidx_annotation)
implementation(Libs.androidx_legacy_support_core_utils)
}

android {
compileSdkVersion(Config.compileSdk)
compileSdkVersion(Config.compileSdk)

defaultConfig {
minSdkVersion(Config.minSdk)
targetSdkVersion(Config.targetSdk)
consumerProguardFiles("proguard-rules.pro")
}
defaultConfig {
minSdkVersion(Config.minSdk)
targetSdkVersion(Config.targetSdk)
consumerProguardFiles("proguard-rules.pro")
}

sourceSets {
named("test") {
java.srcDir("src/test/kotlin")
}
}
sourceSets { named("test") { java.srcDir("src/test/kotlin") } }

buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
}
}
}

if (file("${rootDir}/internal/safekit-build.gradle").exists()) {
project.apply(from = "${rootDir}/internal/safekit-build.gradle")
project.apply(from = "${rootDir}/internal/safekit-build.gradle")
}

apply(from = "${rootDir}/maven.gradle")
135 changes: 66 additions & 69 deletions facebook-bolts/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,98 +7,95 @@
*/

plugins {
id("com.android.library")
id("kotlin-android")
id("com.android.library")
id("kotlin-android")
}

group = "com.facebook.android"

extra["name"] = "Facebook-Bolts-Android-SDK"

extra["artifactId"] = "facebook-bolts"

extra["description"] = "Facebook Android SDK Bolts support library"

extra["url"] = "https://github.com/facebook/facebook-android-sdk"

dependencies {
implementation(Libs.androidx_annotation)
implementation(Libs.androidx_core_ktx)
implementation(Libs.kotlin_stdlib)

// Unit Tests
testImplementation(project(":facebook-testutil"))
testImplementation(Libs.junit)
testImplementation(Libs.robolectric)
testImplementation(Libs.androidx_test_core)
testImplementation(Libs.mockito_inline)
testImplementation(Libs.mockito_kotlin)

testImplementation(Libs.powermock_core)
testImplementation(Libs.powermock_api_mockito2)
testImplementation(Libs.powermock_junit4)
testImplementation(Libs.powermock_junit4_rule)
testImplementation(Libs.powermock_classloading_xstream)
testImplementation(Libs.assertj_core)

testImplementation(Libs.android_installreferrer)
testImplementation(Libs.kotlin_stdlib)
testImplementation(Libs.kotlin_test_junit)
implementation(Libs.androidx_annotation)
implementation(Libs.androidx_core_ktx)
implementation(Libs.kotlin_stdlib)

// Unit Tests
testImplementation(project(":facebook-testutil"))
testImplementation(Libs.junit)
testImplementation(Libs.robolectric)
testImplementation(Libs.androidx_test_core)
testImplementation(Libs.mockito_inline)
testImplementation(Libs.mockito_kotlin)

testImplementation(Libs.powermock_core)
testImplementation(Libs.powermock_api_mockito2)
testImplementation(Libs.powermock_junit4)
testImplementation(Libs.powermock_junit4_rule)
testImplementation(Libs.powermock_classloading_xstream)
testImplementation(Libs.assertj_core)

testImplementation(Libs.android_installreferrer)
testImplementation(Libs.kotlin_stdlib)
testImplementation(Libs.kotlin_test_junit)
}

android {
compileSdkVersion(Config.compileSdk)
// The version of Jacoco used by the android gradle plugin
jacoco {
version = "0.8.7"
compileSdkVersion(Config.compileSdk)
// The version of Jacoco used by the android gradle plugin
jacoco { version = "0.8.7" }

defaultConfig {
minSdkVersion(Config.minSdk)
targetSdkVersion(Config.targetSdk)
consumerProguardFiles("proguard-rules.pro")
}

buildTypes {
getByName("debug") {
isDebuggable = true
isTestCoverageEnabled = true
}
}

defaultConfig {
minSdkVersion(Config.minSdk)
targetSdkVersion(Config.targetSdk)
consumerProguardFiles("proguard-rules.pro")
}
lintOptions { isAbortOnError = false }

buildTypes {
getByName("debug") {
isDebuggable = true
isTestCoverageEnabled = true
}
}
compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
targetCompatibility(JavaVersion.VERSION_1_8)
}

lintOptions {
isAbortOnError = false
testOptions {
unitTests.all {
it.jvmArgs("-XX:MaxPermSize=1024m")
it.maxHeapSize = "4096m"
}
}

compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
targetCompatibility(JavaVersion.VERSION_1_8)
}
sourceSets { named("test") { java.srcDir("src/test/kotlin") } }

if (System.getenv("SANDCASTLE") == "1") {
testOptions {
unitTests.all {
it.jvmArgs("-XX:MaxPermSize=1024m")
it.maxHeapSize = "4096m"
}
}

sourceSets {
named("test") {
java.srcDir("src/test/kotlin")
}
}

if (System.getenv("SANDCASTLE") == "1") {
testOptions {
unitTests.all {
it.systemProperty("robolectric.dependency.repo.url", "https://maven.thefacebook.com/nexus/content/repositories/central/")
it.systemProperty("robolectric.dependency.repo.id", "central")
it.systemProperty("java.net.preferIPv6Addresses", "true")
it.systemProperty("java.net.preferIPv4Stack", "false")
}
}
unitTests.all {
it.systemProperty(
"robolectric.dependency.repo.url",
"https://maven.thefacebook.com/nexus/content/repositories/central/")
it.systemProperty("robolectric.dependency.repo.id", "central")
it.systemProperty("java.net.preferIPv6Addresses", "true")
it.systemProperty("java.net.preferIPv4Stack", "false")
}
}
}
}

apply(from = "${rootDir}/jacoco.gradle.kts")

apply(from = "${rootDir}/maven.gradle")
repositories {
mavenCentral()
}

repositories { mavenCentral() }
Loading

0 comments on commit 56db002

Please sign in to comment.