Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Technical: Use Android Source Set Layout Version 2. #962

Merged
merged 1 commit into from
Mar 25, 2023
Merged

Technical: Use Android Source Set Layout Version 2. #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,6 @@ allprojects {
mavenCentral()
gradlePluginPortal()
}

afterEvaluate {
// To avoid:
// The Kotlin source set androidAndroidTestRelease was configured but not added to any Kotlin compilation. You can add a source set to a target"s compilation by connecting it with the compilation"s default source set using "dependsOn".
// See https://kotlinlang.org/docs/reference/building-mpp-with-gradle.html#connecting-source-sets
project.extensions.findByType(org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension.class)?.sourceSets?.removeAll {
[
"androidAndroidTestRelease",
"androidTestFixtures",
"androidTestFixturesDebug",
"androidTestFixturesRelease"
].contains(it.name)
}
}
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion emoji-facebook/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ kotlin {
androidMain.dependencies {
}

androidTest.dependencies {
androidUnitTest.dependencies {
implementation libs.kotlin.test.junit
implementation libs.robolectric
}
Expand Down
2 changes: 1 addition & 1 deletion emoji-google-compat/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ kotlin {
api libs.androidx.emoji.appcompat
}

androidTest.dependencies {
androidUnitTest.dependencies {
implementation libs.kotlin.test.junit
implementation libs.robolectric
}
Expand Down
2 changes: 1 addition & 1 deletion emoji-google/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ kotlin {
androidMain.dependencies {
}

androidTest.dependencies {
androidUnitTest.dependencies {
implementation libs.kotlin.test.junit
implementation libs.robolectric
}
Expand Down
2 changes: 1 addition & 1 deletion emoji-ios/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ kotlin {
androidMain.dependencies {
}

androidTest.dependencies {
androidUnitTest.dependencies {
implementation libs.kotlin.test.junit
implementation libs.robolectric
}
Expand Down
0 .../ios/commonTestEmojiProviderAndroidApi.kt → .../ios/commonTestEmojiProviderAndroidApi.kt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion emoji-material/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ kotlin {
api libs.material
}

androidTest.dependencies {
androidUnitTest.dependencies {
implementation libs.kotlin.test.junit
implementation libs.robolectric
}
Expand Down
2 changes: 1 addition & 1 deletion emoji-twitter/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ kotlin {
androidMain.dependencies {
}

androidTest.dependencies {
androidUnitTest.dependencies {
implementation libs.kotlin.test.junit
implementation libs.robolectric
}
Expand Down
2 changes: 1 addition & 1 deletion emoji/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ kotlin {
}
}

androidTest {
androidUnitTest {
dependencies {
implementation libs.kotlin.test.junit
implementation libs.robolectric
Expand Down
0 ...nniktech/emoji/EmojiManagerAndroidTest.kt → ...nniktech/emoji/EmojiManagerAndroidTest.kt
View file
Open in desktop
File renamed without changes.
0 ...anniktech/emoji/RecentEmojiManagerTest.kt → ...anniktech/emoji/RecentEmojiManagerTest.kt
View file
Open in desktop
File renamed without changes.
0 ...nniktech/emoji/VariantEmojiManagerTest.kt → ...nniktech/emoji/VariantEmojiManagerTest.kt
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ android.defaults.buildfeatures.resvalues=false
android.defaults.buildfeatures.shaders=false

kotlin.mpp.stability.nowarn=true

kotlin.mpp.androidSourceSetLayoutVersion=2
7 changes: 4 additions & 3 deletions jvm/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ mainClassName = "com.vanniktech.emoji.jvm.MainKt"

defaultTasks("run")

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
}
}

dependencies {
Expand Down
2 changes: 2 additions & 0 deletions lint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<lint>
<issue id="SyntheticAccessor" severity="error"/>
<issue id="InvalidPackage" severity="ignore"/>
<!-- False positive for the JVM module since we use the new tool mechanism. -->
<issue id="JavaPluginLanguageLevel" severity="ignore"/>
<issue id="ConvertToWebp">
<ignore regexp="_sheet_.*.png"/>
<ignore regexp="emoji_.*_category_.*.png"/>
Expand Down