[#513] [KMM Support] Migrate to Gradle 8 #508
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,12 +8,6 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| timeout-minutes: 30 | ||
| steps: | ||
| - name: Checkout source code | ||
| uses: actions/[email protected] | ||
|
|
||
|
|
@@ -28,36 +22,20 @@ jobs: | |
| restore-keys: | | ||
| ${{ runner.os }}-gradle- | ||
|
|
||
| # template-compose | ||
|
|
||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: '17' | ||
|
|
||
| - name: Run Detekt on template-compose | ||
| working-directory: ./template-compose | ||
| run: ./gradlew detekt | ||
|
|
||
| - name: Archive Detekt reports on template-compose | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: DetektReportsTemplateCompose | ||
| path: template-compose/build/reports/detekt/ | ||
|
|
@@ -67,19 +45,47 @@ jobs: | |
| run: ./gradlew koverHtmlReport | ||
|
|
||
| - name: Archive code coverage reports on template-compose | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: CodeCoverageReportsTemplateCompose | ||
| path: template-compose/app/build/reports/kover/ | ||
|
|
||
| # template-xml | ||
|
|
||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: '11' | ||
|
|
||
| - name: Run Detekt on template-xml | ||
| working-directory: ./template-xml | ||
| run: ./gradlew detekt | ||
|
|
||
| - name: Archive Detekt reports on template-xml | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: DetektReportsTemplateXML | ||
| path: template-xml/build/reports/detekt/ | ||
|
|
||
| - name: Run unit tests with Kover on template-xml | ||
| working-directory: ./template-xml | ||
| run: ./gradlew koverHtmlReport | ||
|
|
||
| - name: Archive code coverage reports on template-xml | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: CodeCoverageReportsTemplateXML | ||
| path: template-xml/app/build/reports/kover/ | ||
|
|
||
| # sample-xml | ||
|
|
||
| - name: Run Detekt on sample-xml | ||
| working-directory: ./sample-xml | ||
| run: ./gradlew detekt | ||
|
|
||
| - name: Archive Detekt reports on sample-xml | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: DetektReportsTemplateXML | ||
| path: sample-xml/build/reports/detekt/ | ||
|
|
@@ -89,7 +95,7 @@ jobs: | |
| run: ./gradlew koverHtmlReport | ||
|
|
||
| - name: Archive code coverage reports on sample-xml | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: CodeCoverageReportsTemplateXML | ||
| path: sample-xml/app/build/reports/kover/ | ||
|
|
@@ -101,7 +107,7 @@ jobs: | |
| run: ./gradlew detekt | ||
|
|
||
| - name: Archive Detekt reports on sample-compose | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: DetektReportsTemplateCompose | ||
| path: sample-compose/build/reports/detekt/ | ||
|
|
@@ -111,7 +117,7 @@ jobs: | |
| run: ./gradlew koverHtmlReport | ||
|
|
||
| - name: Archive code coverage reports on sample-compose | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: CodeCoverageReportsTemplateCompose | ||
| path: sample-compose/app/build/reports/kover/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| import org.jetbrains.kotlin.konan.properties.loadProperties | ||
|
|
||
| plugins { | ||
| id(Plugins.ANDROID_APPLICATION) | ||
| id(Plugins.KOTLIN_ANDROID) | ||
|
|
@@ -7,7 +9,7 @@ plugins { | |
| id(Plugins.KOVER) | ||
| } | ||
|
|
||
| val signingProperties = loadProperties("$rootDir/signing.properties") | ||
luongvo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| val getVersionCode: () -> Int = { | ||
| if (project.hasProperty("versionCode")) { | ||
| (project.property("versionCode") as String).toInt() | ||
|
|
@@ -17,13 +19,29 @@ val getVersionCode: () -> Int = { | |
| } | ||
|
|
||
| android { | ||
| namespace = "co.nimblehq.template.compose" | ||
| compileSdk = Versions.ANDROID_COMPILE_SDK | ||
|
|
||
| defaultConfig { | ||
| applicationId = "co.nimblehq.template.compose" | ||
| minSdk = Versions.ANDROID_MIN_SDK | ||
| targetSdk = Versions.ANDROID_TARGET_SDK | ||
| versionCode = getVersionCode() | ||
| versionName = Versions.ANDROID_VERSION_NAME | ||
|
|
||
| testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
| vectorDrawables { | ||
| useSupportLibrary = true | ||
| } | ||
| } | ||
|
|
||
| signingConfigs { | ||
| create(BuildTypes.RELEASE) { | ||
| // Remember to edit signing.properties to have the correct info for release build. | ||
| storeFile = file("../config/release.keystore") | ||
| storePassword = signingProperties.getProperty("KEYSTORE_PASSWORD") as String | ||
| keyPassword = signingProperties.getProperty("KEY_PASSWORD") as String | ||
| keyAlias = signingProperties.getProperty("KEY_ALIAS") as String | ||
| } | ||
|
|
||
| getByName(BuildTypes.DEBUG) { | ||
|
|
@@ -34,18 +52,8 @@ android { | |
| } | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
|
There was a problem hiding this comment. Why do we need to update this? 🤔 There was a problem hiding this comment. @lydiasama |
||
| isMinifyEnabled = true | ||
| isDebuggable = false | ||
| isShrinkResources = true | ||
|
|
@@ -54,7 +62,7 @@ android { | |
| buildConfigField("String", "BASE_API_URL", "\"https://jsonplaceholder.typicode.com/\"") | ||
| } | ||
|
|
||
| debug { | ||
| // For quickly testing build with proguard, enable this | ||
| isMinifyEnabled = false | ||
| signingConfig = signingConfigs[BuildTypes.DEBUG] | ||
|
|
@@ -76,20 +84,27 @@ android { | |
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility = JavaVersion.VERSION_17 | ||
| targetCompatibility = JavaVersion.VERSION_17 | ||
| } | ||
|
|
||
| kotlinOptions { | ||
| jvmTarget = JavaVersion.VERSION_17.toString() | ||
| } | ||
|
|
||
| buildFeatures { | ||
| compose = true | ||
| buildConfig = true | ||
| } | ||
|
|
||
| composeOptions { | ||
| kotlinCompilerExtensionVersion = Versions.COMPOSE_COMPILER | ||
| } | ||
|
|
||
| packaging { | ||
| resources { | ||
| excludes += "/META-INF/{AL2.0,LGPL2.1}" | ||
| } | ||
| } | ||
|
|
||
| lint { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Can we remove the Cache gems step and set the
bundler-cache: trueat Set up Ruby step like we did in KMM Templates?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.
@lydiasama Yes, but it's out of this PR's scope. I recommend revising this workflow from this task instead #519.