Browse Source

Reorganize source sets to work around red code resolution errors. (#50)

Co-authored-by: Sebastian Aigner <sebastian.aigner@jetbrains.com>
pull/52/head
Sebastian Aigner 4 years ago committed by GitHub
parent
commit
0723177aad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      examples/issues/android/build.gradle.kts
  2. 6
      examples/issues/common/build.gradle.kts
  3. 4
      examples/issues/common/src/commonMain/kotlin/androidx/ui/examples/jetissues/data/Model.kt
  4. 0
      examples/issues/common/src/jvmAndAndroidMain/kotlin/androidx/ui/examples/jetissues/data/Effects.kt
  5. 6
      examples/issues/common/src/jvmAndAndroidMain/kotlin/androidx/ui/examples/jetissues/data/IssuesRepository.kt
  6. 0
      examples/issues/common/src/jvmAndAndroidMain/kotlin/androidx/ui/examples/jetissues/view/JetIssuesView.kt

2
examples/issues/android/build.gradle.kts

@ -8,7 +8,7 @@ android {
compileSdkVersion(30) compileSdkVersion(30)
defaultConfig { defaultConfig {
minSdkVersion(21) minSdkVersion(26)
targetSdkVersion(30) targetSdkVersion(30)
versionCode = 1 versionCode = 1
versionName = "1.0" versionName = "1.0"

6
examples/issues/common/build.gradle.kts

@ -22,11 +22,15 @@ kotlin {
} }
} }
named("androidMain") { named("androidMain") {
kotlin.srcDirs("src/jvmAndAndroidMain/kotlin")
dependencies { dependencies {
api("androidx.appcompat:appcompat:1.1.0") api("androidx.appcompat:appcompat:1.1.0")
api("androidx.core:core-ktx:1.3.1") api("androidx.core:core-ktx:1.3.1")
} }
} }
named("desktopMain") {
kotlin.srcDirs("src/jvmAndAndroidMain/kotlin")
}
} }
} }
@ -39,7 +43,7 @@ android {
compileSdkVersion(30) compileSdkVersion(30)
defaultConfig { defaultConfig {
minSdkVersion(21) minSdkVersion(26)
targetSdkVersion(30) targetSdkVersion(30)
versionCode = 1 versionCode = 1
versionName = "1.0" versionName = "1.0"

4
examples/issues/common/src/commonMain/kotlin/androidx/ui/examples/jetissues/data/Model.kt

@ -1,4 +0,0 @@
package androidx.ui.examples.jetissues.data
import androidx.ui.examples.jetissues.query.type.IssueState

0
examples/issues/common/src/commonMain/kotlin/androidx/ui/examples/jetissues/data/Effects.kt → examples/issues/common/src/jvmAndAndroidMain/kotlin/androidx/ui/examples/jetissues/data/Effects.kt

6
examples/issues/common/src/commonMain/kotlin/androidx/ui/examples/jetissues/data/IssuesRepository.kt → examples/issues/common/src/jvmAndAndroidMain/kotlin/androidx/ui/examples/jetissues/data/IssuesRepository.kt

@ -7,10 +7,10 @@
// You can follow the progress for HMPP JVM & Android intermediate source sets here: // You can follow the progress for HMPP JVM & Android intermediate source sets here:
// https://youtrack.jetbrains.com/issue/KT-42466 // https://youtrack.jetbrains.com/issue/KT-42466
// //
// The workaround used here to access JVM libraries causes IntelliJ IDEA to not // Because of the workaround used, some tooling might not behave as expected.
// resolve symbols in this file properly.
// //
// Resolution errors in your IDE do not indicate a problem with your setup. // Resolution errors (expect/actual, red code) in your IDE
// do not indicate a problem with your setup.
package androidx.ui.examples.jetissues.data package androidx.ui.examples.jetissues.data

0
examples/issues/common/src/commonMain/kotlin/androidx/ui/examples/jetissues/view/JetIssuesView.kt → examples/issues/common/src/jvmAndAndroidMain/kotlin/androidx/ui/examples/jetissues/view/JetIssuesView.kt

Loading…
Cancel
Save