Merge pull request #17 from 2BAB/dev

Upgrade Polyfill to 0.7.0 and support AGP 7.2.x
2BAB · Aug 27, 2022 · 8384e44 · 8384e44
2 parents fb6a1e1 + e8b7aff
commit 8384e44
Show file tree

Hide file tree

Showing 61 changed files with 450 additions and 420 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
       JAVA_TOOL_OPTIONS: -Xmx4g
-
+    defaults:
+      run:
+        working-directory: ./sample
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
@@ -41,7 +43,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ github.job }}-
       - run: |
-          ./gradlew assemble
+          ./gradlew clean assembleDebug
   checks:
     name: Checks (unit tests and static analysis, TODO:add detekt check after set it up)
     runs-on: ubuntu-latest
@@ -65,17 +67,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ github.job }}-
       - run: |
-          ./gradlew :seal:plugin:test
+          ./gradlew :seal:test
   functional-tests:
     name: Functional tests
     runs-on: ubuntu-latest
     env:
       JAVA_TOOL_OPTIONS: -Xmx4g
-      AGP_VERSION: ${{ matrix.agp-version }}
-    strategy:
-      matrix:
-        agp-version: [ 7.1.2, 7.2.0-beta04 ]
-
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
@@ -89,8 +86,26 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: ${{ runner.os }}-${{ github.job }}-${{ matrix.agp-version }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+          key: ${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
           restore-keys: |
-            ${{ runner.os }}-${{ github.job }}-${{ matrix.agp-version }}-
+            ${{ runner.os }}-${{ github.job }}-
+      - name: Prepare environment
+        env:
+          SIGNING_SECRET_KEY_CONTENT: ${{ secrets.SIGNING_SECRET_KEY_CONTENT }}
+          SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
+        run: |
+          git fetch --unshallow
+          sudo bash -c "echo '$SIGNING_SECRET_KEY_CONTENT' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'"
+      - name: Build & Release all Polyfill libraries to MavenLocal
+        run: chmod +x ./publish_to_local.sh | ./publish_to_local.sh
+        env:
+          SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
+          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+          SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
+          SIGNING_SECRET_KEY_CONTENT: ${{ secrets.SIGNING_SECRET_KEY_CONTENT }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          GH_DEV_TOKEN: ${{ secrets.GH_DEV_TOKEN }}
       - run: |
-          ./gradlew :seal:plugin:functionalTest
+          ./gradlew clean :functional-test:functionalTest
+      
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,13 @@
 *.iml
 .gradle
-/sample/local.properties
 .idea
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
 local.properties
+.idea/
+.gradle/
+build/
+local/
diff --git a/README.md b/README.md
@@ -23,8 +23,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.2")
-        classpath("me.2bab:seal:3.2.0")
+        classpath("com.android.tools.build:gradle:7.2.2")
+        classpath("me.2bab:seal:3.3.0")
     }
 }
 ```

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,4 @@
-task("clean") {
-    delete(rootProject.buildDir)
+allprojects {
+    group = "me.2bab"
+    version = BuildConfig.Versions.sealVersion
 }
diff --git a/seal/buildSrc/build.gradle.kts → buildSrc/build.gradle.kts b/seal/buildSrc/build.gradle.kts → buildSrc/build.gradle.kts
diff --git a/seal/buildSrc/src/main/kotlin/BuildConfig.kt → buildSrc/src/main/kotlin/BuildConfig.kt b/seal/buildSrc/src/main/kotlin/BuildConfig.kt → buildSrc/src/main/kotlin/BuildConfig.kt
@@ -1,7 +1,7 @@
 object BuildConfig {
 
     object Versions {
-        const val sealVersion = "3.2.0"
+        const val sealVersion = "3.3.0"
     }
 
 }
diff --git a/...src/main/kotlin/github-release.gradle.kts → ...src/main/kotlin/github-release.gradle.kts b/...src/main/kotlin/github-release.gradle.kts → ...src/main/kotlin/github-release.gradle.kts
diff --git a/...n/kotlin/maven-central-publish.gradle.kts → ...n/kotlin/maven-central-publish.gradle.kts b/...n/kotlin/maven-central-publish.gradle.kts → ...n/kotlin/maven-central-publish.gradle.kts
@@ -1,4 +1,4 @@
-plugins{
+plugins {
     `maven-publish`
     signing
 }
@@ -32,6 +32,7 @@ if (secretPropsFile.exists()) {
 val javadocJar by tasks.registering(Jar::class) {
     archiveClassifier.set("javadoc")
 }
+
 fun getExtraString(name: String) = ext[name]?.toString()
 
 
@@ -42,6 +43,7 @@ val baseUrl = "https://github.com/2BAB/Seal"
 val siteUrl = baseUrl
 val gitUrl = "$baseUrl.git"
 val issueUrl = "$baseUrl/issues"
+val emailAddr = "xx2bab@gmail.com"
 
 val licenseIds = "Apache-2.0"
 val licenseNames = arrayOf("The Apache Software License, Version 2.0")
@@ -50,25 +52,52 @@ val inception = "2017"
 
 val username = "2BAB"
 
-
 publishing {
+    // Configure MavenCentral repository
+    repositories {
+        maven {
+            name = "sonatype"
+            setUrl("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
+            credentials {
+                username = getExtraString("ossrh.username")
+                password = getExtraString("ossrh.password")
+            }
+        }
+    }
+
+    // Configure MavenLocal repository
+    repositories {
+        maven {
+            name = "myMavenlocal"
+            url = uri(System.getProperty("user.home") + "/.m2/repository")
+        }
+    }
+}
 
-    publications {
-        create<MavenPublication>("SealPlugin") {
+signing {
+    sign(publishing.publications)
+}
+
+// To add missing information for the gradle plugin coordinator
+afterEvaluate {
+    publishing.publications.all {
+        val publicationName = this.name
+        (this as MavenPublication).apply {
+            if (publicationName == "pluginMaven") {
+                groupId = groupName
+                artifactId = projectName
+            }
+            version = BuildConfig.Versions.sealVersion
             artifact(javadocJar.get())
-            from(components["java"])
+
             pom {
-                // Description
-                name.set(projectName)
+                if (publicationName == "pluginMaven") {
+                    name.set(project.name)
+                }
+
                 description.set(mavenDesc)
                 url.set(siteUrl)
 
-                // Archive
-                groupId = groupName
-                artifactId = projectName
-                version = BuildConfig.Versions.sealVersion
-
-                // License
                 inceptionYear.set(inception)
                 licenses {
                     licenseNames.forEachIndexed { ln, li ->
@@ -91,28 +120,4 @@ publishing {
             }
         }
     }
-
-    // Configure MavenCentral repository
-    repositories {
-        maven {
-            name = "sonatype"
-            setUrl("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
-            credentials {
-                username = getExtraString("ossrh.username")
-                password = getExtraString("ossrh.password")
-            }
-        }
-    }
-
-    // Configure MavenLocal repository
-    repositories {
-        maven {
-            name = "myMavenlocal"
-            url = uri(System.getProperty("user.home") + "/.m2/repository")
-        }
-    }
-}
-
-signing {
-    sign(publishing.publications)
 }
diff --git a/deps.versions.toml b/deps.versions.toml
@@ -1,20 +1,21 @@
 [versions]
-kotlinVer = "1.6.10"
-agpVer = "7.1.2"
-polyfillVer = "0.5.0"
-mockitoVer = "3.9.0"
+kotlinVer = "1.6.21"
+polyfillVer = "0.7.0"
+agpVer = "7.2.2"
+agpPatchIgnoredVer = "7.2.0" # To be used by backport version matching
+agpBackportVer = "7.1.3"
+agpBackportPatchIgnoredVer = "7.1.0" # To be used by backport version matching, e.g. apply backport patches when (7.1.0 <= ver < 7.2.0)
+
 
 [libraries]
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agpVer" }
 kotlin-std = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlinVer" }
-kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm", version = "1.3.1" }
+kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.3.1" }
+kotlin-coroutine = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version = "1.6.0" }
+hamcrest = { module = "org.hamcrest:hamcrest-library", version = "2.2" }
 polyfill-main = { module = "me.2bab:polyfill", version.ref = "polyfillVer" }
-polyfill-manifest = { module = "me.2bab:android-manifest-parser", version.ref = "polyfillVer" }
-fastJson = { module = "com.alibaba:fastjson", version = "1.2.73" }
+polyfill-manifest-parser = { module = "me.2bab:android-manifest-parser", version.ref = "polyfillVer" }
 zip4j = { module = "net.lingala.zip4j:zip4j", version = "2.6.2" }
-junit = { module = "junit:junit", version = "4.12" }
-mockito = { module = "org.mockito:mockito-core", version.ref = "mockitoVer" }
-mockitoInline = { module = "org.mockito:mockito-inline", version.ref = "mockitoVer" }
 
 [bundles]
 

diff --git a/seal/plugin/.gitignore → functional-test/.gitignore b/seal/plugin/.gitignore → functional-test/.gitignore
diff --git a/functional-test/build.gradle.kts b/functional-test/build.gradle.kts
@@ -0,0 +1,45 @@
+plugins {
+    kotlin("jvm")
+    kotlin("plugin.serialization")
+}
+
+group = "me.2bab"
+
+java {
+    withSourcesJar()
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+dependencies {
+    implementation(deps.kotlin.std)
+    implementation(deps.kotlin.coroutine)
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
+}
+
+testing {
+    suites {
+        val functionalTest by registering(JvmTestSuite::class) {
+            useJUnitJupiter()
+            testType.set(TestSuiteType.FUNCTIONAL_TEST)
+            dependencies {
+                implementation(deps.hamcrest)
+                implementation("dev.gradleplugins:gradle-test-kit:7.4.2")
+                implementation(deps.kotlin.coroutine)
+                implementation(deps.kotlin.serialization)
+                implementation(deps.zip4j)
+                implementation(deps.polyfill.manifest.parser)
+            }
+        }
+    }
+}
+
+tasks.named("check") {
+    dependsOn(testing.suites.named("functionalTest"))
+}
+
+tasks.withType<Test> {
+    testLogging {
+        this.showStandardStreams = true
+    }
+}