diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c4d8bb30..851ef59fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - os: [macos-14, ubuntu-latest, windows-latest] + os: [ macos-14, ubuntu-latest, windows-latest ] runs-on: ${{matrix.os}} @@ -153,13 +153,10 @@ jobs: run: | echo "${{ secrets.KEYSTORE }}" > opensource.jks.asc gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch "opensource.jks.asc" > "app/opensource.jks" - echo "${{ secrets.SIGNING_GRADLE }}" > signing.gradle.asc - gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch "signing.gradle.asc" > "app/signing.gradle" - echo "openSource.signing.file=signing.gradle" >> local.properties - name: Build Release App if: startsWith(github.ref, 'refs/tags/') - run: ./gradlew app:assembleStaging app:assembleRelease app:bundleRelease + run: ./gradlew app:assembleStaging app:assembleRelease app:bundleRelease -P"com.mikepenz.android.signing.enabled"="true" -P"com.mikepenz.android.signing.storeFile"="app/opensource.jks" -P"com.mikepenz.android.signing.storePassword"="${{ secrets.STORE_PASSWORD }}" -P"com.mikepenz.android.signing.keyAlias"="${{ secrets.KEY_ALIAS }}" -P"com.mikepenz.android.signing.keyPassword"="${{ secrets.KEY_PASSWORD }}" - name: Collect artifacts run: | diff --git a/aboutlibraries-core/build.gradle.kts b/aboutlibraries-core/build.gradle.kts index 7e77d4ca3..f7964712a 100644 --- a/aboutlibraries-core/build.gradle.kts +++ b/aboutlibraries-core/build.gradle.kts @@ -20,9 +20,7 @@ kotlin { api(libs.kotlinx.collections) } } - val multiplatformMain by creating { - dependsOn(commonMain) - } + val multiplatformMain by creating val jvmMain by getting { dependsOn(multiplatformMain) } @@ -32,9 +30,7 @@ kotlin { val jsMain by getting { dependsOn(multiplatformMain) } - val androidMain by getting { - dependsOn(commonMain) - } + val androidMain by getting val wasmJsMain by getting { dependsOn(multiplatformMain) } diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2391a89ac..aaaf808d4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,21 +1,14 @@ import com.mikepenz.aboutlibraries.plugin.DuplicateMode import com.mikepenz.aboutlibraries.plugin.DuplicateRule import com.mikepenz.aboutlibraries.plugin.StrictMode -import com.mikepenz.gradle.utils.readPropertyOrElse plugins { - kotlin("android") - id("com.mikepenz.convention.android-application") id("com.mikepenz.convention.kotlin-multiplatform") + id("com.mikepenz.convention.android-application") id("com.mikepenz.convention.compose") id("com.mikepenz.aboutlibraries.plugin") } -val openSourceSigningFile: String? = readPropertyOrElse("openSource.signing.file") -if (openSourceSigningFile != null) { - apply(from = openSourceSigningFile) -} - android { namespace = "com.mikepenz.aboutlibraries.sample" @@ -25,17 +18,11 @@ android { } buildTypes { - getByName("debug") { - signingConfig = signingConfigs.findByName("debug") - } create("staging") { signingConfig = signingConfigs.findByName("release") applicationIdSuffix = ".debugStaging" matchingFallbacks.add("debug") } - getByName("release") { - signingConfig = signingConfigs.findByName("release") - } } productFlavors { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e090ef192..06e5e5e33 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -conventionPlugin = "0.1.1" +conventionPlugin = "0.1.3" # kotlin kotlinxSerialization = "1.7.3" kotlinxCollections = "0.3.8"