-
Notifications
You must be signed in to change notification settings - Fork 0
WIP feature: sdds-uikit-compose migration on KMP #277
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.
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
base: develop
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,3 +33,4 @@ google-services.json | |
| *.hprof | ||
|
|
||
| .DS_Store | ||
| *yarn.lock | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| import com.android.build.gradle.internal.api.BaseVariantOutputImpl | ||
| import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig | ||
| import utils.versionInfo | ||
| import utils.withVersionCatalogs | ||
|
|
||
| plugins { | ||
| id("com.android.application") | ||
| kotlin("multiplatform") | ||
| id("org.jetbrains.compose") | ||
| id("convention.detekt") | ||
| id("convention.spotless") | ||
| } | ||
|
|
||
| kotlin { | ||
| android { | ||
| withVersionCatalogs { | ||
| compilations.all { | ||
| kotlinOptions { | ||
| jvmTarget = versions.global.jvmTarget.get() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| jvm("desktop") | ||
| } | ||
|
|
||
|
|
||
| android { | ||
| val vInfo = versionInfo() | ||
| // sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @malilex почему закоммичен закомментированный код?
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. это ж wip, я запушил, чтобы другие могли оценить объем доработок при миграции. |
||
| withVersionCatalogs { | ||
| compileSdk = versions.global.compileSdk.get().toInt() | ||
|
|
||
| defaultConfig { | ||
| applicationVariants.all { | ||
| outputs.all { | ||
| val output = this as BaseVariantOutputImpl | ||
| output.outputFileName = output.outputFileName | ||
| .replace(".apk", "-${vInfo.fullArtifactName}.apk") | ||
| } | ||
| } | ||
| minSdk = versions.global.minSdk.get().toInt() | ||
| targetSdk = versions.global.targetSdk.get().toInt() | ||
| testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
| versionCode = vInfo.code | ||
| versionName = vInfo.name | ||
| versionNameSuffix = vInfo.nameSuffix | ||
|
|
||
| } | ||
| } | ||
|
|
||
| signingConfigs { | ||
| create("release") { | ||
| if (System.getenv("KEY_STORE_FILE") != null) { | ||
| storeFile = file(System.getenv("KEY_STORE_FILE")) | ||
| storePassword = System.getenv("RELEASE_STORE_PASSWORD") | ||
| keyAlias = System.getenv("RELEASE_KEY_ALIAS") | ||
| keyPassword = System.getenv("RELEASE_KEY_PASSWORD") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| if (System.getenv("KEY_STORE_FILE") != null) { | ||
| signingConfig = signingConfigs.getByName("release") | ||
| } | ||
| isMinifyEnabled = false | ||
| proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") | ||
| } | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| } | ||
|
|
||
| lint { | ||
| xmlReport = false | ||
| textReport = false | ||
| sarifReport = false | ||
| htmlReport = true | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| import org.gradle.kotlin.dsl.kotlin | ||
| import utils.withVersionCatalogs | ||
|
|
||
| plugins { | ||
| id("com.android.library") | ||
| kotlin("multiplatform") | ||
| id("org.jetbrains.compose") | ||
| id("convention.detekt") | ||
| id("convention.spotless") | ||
| } | ||
|
|
||
| kotlin { | ||
| android { | ||
| publishLibraryVariants("release") | ||
| withVersionCatalogs { | ||
| compilations.all { | ||
| kotlinOptions { | ||
| jvmTarget = versions.global.jvmTarget.get() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| jvm("desktop") | ||
| } | ||
|
|
||
| android { | ||
|
|
||
| withVersionCatalogs { | ||
| compileSdk = versions.global.compileSdk.get().toInt() | ||
|
|
||
| defaultConfig { | ||
| minSdk = versions.global.minSdk.get().toInt() | ||
| testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
| } | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| isMinifyEnabled = false | ||
| proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") | ||
| } | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility = JavaVersion.VERSION_1_8 | ||
| targetCompatibility = JavaVersion.VERSION_1_8 | ||
| } | ||
|
|
||
| lint { | ||
| xmlReport = false | ||
| textReport = false | ||
| sarifReport = false | ||
| htmlReport = true | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ allprojects { | |
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| mavenLocal() | ||
| } | ||
| } | ||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@malilex и здесь тоже закомментированный код, надо удалить?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ответил выше