diff --git a/build.gradle b/build.gradle index c976358f64..342dd96f2e 100644 --- a/build.gradle +++ b/build.gradle @@ -157,11 +157,6 @@ ext.deps = [ supportTransition : 'androidx.transition:transition:1.0.0', supportSwipeRefresh: 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0', supportDynamicAnimations : 'androidx.dynamicanimation:dynamicanimation-ktx:1.0.0-alpha03', - // compose - activityCompose : 'androidx.activity:activity-compose:1.9.0', - composeFoundation : 'androidx.compose.foundation:foundation:1.7.0', - composeUi : 'androidx.compose.ui:ui:1.7.0', - composeRuntime : 'androidx.compose.runtime:runtime:1.7.0', // lifecycle lifecycle : 'androidx.lifecycle:lifecycle-runtime:2.6.1', viewModel : 'androidx.lifecycle:lifecycle-viewmodel:2.3.1', diff --git a/litho-compose/build.gradle b/litho-compose/build.gradle deleted file mode 100644 index c0adfde79f..0000000000 --- a/litho-compose/build.gradle +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'com.facebook.kotlin.compilerplugins.dataclassgenerate' - -project.group = GROUP -version = VERSION_NAME - -android { - compileSdkVersion rootProject.compileSdkVersion - buildToolsVersion rootProject.buildToolsVersion - - defaultConfig { - minSdkVersion rootProject.minSdkVersion - } - - testOptions { - unitTests { - includeAndroidResources = true - - all { - // Because of native libraries loading (Yoga), we can never reuse a class loader and - // need to fork a new process per class. - forkEvery = 1 - maxParallelForks = 2 - - testLogging { - events 'skipped', 'failed', 'standardOut', 'standardError' - showCauses = true - showExceptions = true - showStackTraces = true - exceptionFormat = 'full' - stackTraceFilters = [] - } - } - } - } - - buildFeatures { - compose true - } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.10" - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - test.java.srcDirs += 'src/test/kotlin' - } - namespace 'com.facebook.litho.compose' -} - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - freeCompilerArgs = ["-XXLanguage:+InlineClasses"] - } -} - -dependencies { - api project(':litho-core') - - // Annotations - compileOnly deps.jsr305 - compileOnly deps.inferAnnotations - - implementation deps.kotlinCoroutines - implementation deps.kotlinStandardLib - implementation deps.supportCore - implementation deps.supportDynamicAnimations - implementation deps.activityCompose - api deps.composeFoundation - api deps.composeUi - api deps.composeRuntime - - // Android Support Library - compileOnly deps.supportAnnotations - - testImplementation deps.assertjCore - testImplementation deps.junit - testImplementation deps.kotlinCoroutinesTest - testImplementation deps.mockitokotlin - testImplementation deps.robolectric - testImplementation deps.supportRecyclerView - testImplementation deps.supportTestJunit - testImplementation project(':litho-rendercore-testing') - testImplementation project(':litho-testing') - testImplementation project(':litho-widget-kotlin') -} - -apply plugin: "com.vanniktech.maven.publish" diff --git a/litho-compose/gradle.properties b/litho-compose/gradle.properties deleted file mode 100644 index a4393fe0da..0000000000 --- a/litho-compose/gradle.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -POM_NAME=LithoCompose -POM_DESCRIPTION=Compose interop for Litho -POM_ARTIFACT_ID=litho-compose -POM_PACKAGING=aar diff --git a/sample/build.gradle b/sample/build.gradle index 3c3bc74b06..9474b93b2b 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -36,12 +36,6 @@ android { lint { abortOnError false } - buildFeatures { - compose true - } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.10" - } // TODO(#62): Re-enable abort on error. } @@ -78,9 +72,6 @@ dependencies { implementation deps.frescoVitoOptions implementation deps.frescoVitoSource implementation deps.guava - implementation deps.composeFoundation - implementation deps.composeUi - implementation deps.composeRuntime // Annotations compileOnly deps.jsr305 diff --git a/settings.gradle b/settings.gradle index d9e40ff41c..5c7ceba5db 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,7 +15,6 @@ */ include ':litho-annotations' -include ':litho-compose' include ':litho-core' include ':litho-coroutines-kotlin' include ':litho-editor-core'