diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 21d810d94..42ac9df8a 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -10,6 +10,8 @@ jobs: env: DISABLE_TENCENT_MAVEN_MIRROR: true steps: + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v3.x - name: checkout uses: actions/checkout@v2 - uses: actions/setup-java@v2 @@ -26,7 +28,7 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: buildSdk - run: ./gradlew wrapper; ./gradlew buildSdk + run: ./gradlew wrapper; ./gradlew buildSdk -S - name: lintSdk run: ./gradlew wrapper; ./gradlew lintSdk - name: build sample/source @@ -49,6 +51,8 @@ jobs: env: DISABLE_TENCENT_MAVEN_MIRROR: true steps: + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v3.x - name: checkout uses: actions/checkout@v2 - uses: actions/setup-java@v2 @@ -65,7 +69,7 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: buildSdk - run: ./gradlew wrapper; ./gradlew buildSdk + run: ./gradlew wrapper; ./gradlew buildSdk -S - name: lintSdk run: ./gradlew wrapper; ./gradlew lintSdk - name: build sample/source @@ -77,6 +81,8 @@ jobs: env: DISABLE_TENCENT_MAVEN_MIRROR: true steps: + - name: Inject slug/short variables + uses: rlespinasse/github-slug-action@v3.x - name: checkout uses: actions/checkout@v2 - uses: actions/cache@v2 diff --git a/projects/sdk/coding/common-aar-settings/.gitignore b/projects/sdk/coding/common-aar-settings/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/projects/sdk/coding/common-aar-settings/.gitignore @@ -0,0 +1 @@ +/build diff --git a/projects/sdk/coding/common-aar-settings/build.gradle b/projects/sdk/coding/common-aar-settings/build.gradle new file mode 100644 index 000000000..1b19262fd --- /dev/null +++ b/projects/sdk/coding/common-aar-settings/build.gradle @@ -0,0 +1,23 @@ +apply plugin: 'java-gradle-plugin' + +apply plugin: 'kotlin' + +group 'com.tencent.shadow.coding' + +gradlePlugin { + plugins { + shadow { + id = "com.tencent.shadow.internal.common-aar-settings" + implementationClass = "com.tencent.shadow.coding.common_aar_settings.CommonAarSettingsPlugin" + } + } +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "com.android.tools.build:gradle:$build_gradle_version" + implementation "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + testImplementation 'junit:junit:4.12' + testImplementation gradleTestKit() + +} diff --git a/projects/sdk/coding/common-aar-settings/src/main/kotlin/com/tencent/shadow/coding/common_aar_settings/CommonAarSettingsPlugin.kt b/projects/sdk/coding/common-aar-settings/src/main/kotlin/com/tencent/shadow/coding/common_aar_settings/CommonAarSettingsPlugin.kt new file mode 100644 index 000000000..5a3f4c01b --- /dev/null +++ b/projects/sdk/coding/common-aar-settings/src/main/kotlin/com/tencent/shadow/coding/common_aar_settings/CommonAarSettingsPlugin.kt @@ -0,0 +1,75 @@ +package com.tencent.shadow.coding.common_aar_settings + +import com.android.build.gradle.BaseExtension +import org.gradle.api.JavaVersion +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.plugins.ExtensionAware +import org.gradle.api.plugins.ExtraPropertiesExtension +import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions + +class CommonAarSettingsPlugin : Plugin { + + override fun apply(project: Project) { + project.pluginManager.apply("com.android.library") + project.pluginManager.apply("com.tencent.shadow.internal.aar-to-jar") + + val android = project.extensions.getByName("android") as BaseExtension + + configVersions(project, android) + + keepOldAGPBehavior(android, project) + + addCommonDependencies(project) + } + + private fun addCommonDependencies(project: Project) { + project.dependencies.add("implementation", "com.tencent.shadow.coding:lint") + } + + private fun keepOldAGPBehavior( + android: BaseExtension, + project: Project + ) { + // Starting in version 4.2, AGP will use the Java 8 language level by default. + // To keep the old behavior, specify Java 7 explicitly. + // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default + android.compileOptions { + it.sourceCompatibility = JavaVersion.VERSION_1_7 + it.targetCompatibility = JavaVersion.VERSION_1_7 + } + + // For Kotlin projects, compile to Java 6 instead of 7 + project.afterEvaluate { + val kotlinOptions = (it.extensions.getByName("android") as ExtensionAware).extensions + .findByType(KotlinJvmOptions::class.java) + kotlinOptions?.apply { + jvmTarget = "1.6" + } + } + + android.defaultConfig.buildConfigField( + "String", + "VERSION_NAME", + "\"${android.defaultConfig.versionName}\"" + ) + } + + private fun configVersions( + project: Project, + android: BaseExtension + ) { + val ext = project.extensions.getByName("ext") as ExtraPropertiesExtension + + android.compileSdkVersion(ext["COMPILE_SDK_VERSION"] as Int) + + android.defaultConfig { + it.minSdk = ext["MIN_SDK_VERSION"] as Int + it.targetSdk = ext["TARGET_SDK_VERSION"] as Int + it.versionCode = ext["VERSION_CODE"] as Int + it.versionName = ext["VERSION_NAME"] as String + it.testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" + } + } + +} \ No newline at end of file diff --git a/projects/sdk/coding/lint/build.gradle b/projects/sdk/coding/lint/build.gradle index 9c077b025..fa253c301 100644 --- a/projects/sdk/coding/lint/build.gradle +++ b/projects/sdk/coding/lint/build.gradle @@ -14,16 +14,6 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } - - buildTypes { - debug { - minifyEnabled false - } - - release { - minifyEnabled false - } - } } dependencies { diff --git a/projects/sdk/coding/settings.gradle b/projects/sdk/coding/settings.gradle index d29b452e1..fd1d65cb0 100644 --- a/projects/sdk/coding/settings.gradle +++ b/projects/sdk/coding/settings.gradle @@ -1,3 +1,4 @@ include 'checks', 'lint' include 'code-generator' -include 'aar-to-jar-plugin' \ No newline at end of file +include 'aar-to-jar-plugin' +include 'common-aar-settings' diff --git a/projects/sdk/core/activity-container/build.gradle b/projects/sdk/core/activity-container/build.gradle index 5d9b3da7a..dfa57924f 100644 --- a/projects/sdk/core/activity-container/build.gradle +++ b/projects/sdk/core/activity-container/build.gradle @@ -1,37 +1,11 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.tencent.shadow.internal.aar-to-jar' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' group 'com.tencent.shadow.core' android { - compileSdkVersion project.COMPILE_SDK_VERSION - - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - buildConfigField("String","VERSION_NAME","\"${defaultConfig.versionName}\"") - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - - } - sourceSets { main.java.srcDirs += project(':generate-delegate-code').buildDir.path + '/generated/DelegateCode/activity_container' } - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} - -dependencies{ - implementation 'com.tencent.shadow.coding:lint' } preBuild.dependsOn(project(":generate-delegate-code").getTasksByName("generateDelegateCode", false).first()) diff --git a/projects/sdk/core/build.gradle b/projects/sdk/core/build.gradle index 48f65da2b..581efcb62 100644 --- a/projects/sdk/core/build.gradle +++ b/projects/sdk/core/build.gradle @@ -17,6 +17,7 @@ buildscript { classpath "com.android.tools.build:gradle:$build_gradle_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.tencent.shadow.coding:aar-to-jar-plugin' + classpath 'com.tencent.shadow.coding:common-aar-settings' } } apply from: '../../../buildScripts/gradle/common.gradle' diff --git a/projects/sdk/core/common/build.gradle b/projects/sdk/core/common/build.gradle index d8f10d344..0c16b49ee 100644 --- a/projects/sdk/core/common/build.gradle +++ b/projects/sdk/core/common/build.gradle @@ -1,30 +1,3 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.tencent.shadow.internal.aar-to-jar' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' group 'com.tencent.shadow.core' - -android { - compileSdkVersion project.COMPILE_SDK_VERSION - - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - - } - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} - -dependencies{ - implementation 'com.tencent.shadow.coding:lint' -} diff --git a/projects/sdk/core/load-parameters/build.gradle b/projects/sdk/core/load-parameters/build.gradle index a3df6b22d..0c16b49ee 100644 --- a/projects/sdk/core/load-parameters/build.gradle +++ b/projects/sdk/core/load-parameters/build.gradle @@ -1,33 +1,3 @@ -apply plugin: 'com.android.library' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' group 'com.tencent.shadow.core' - -android { - compileSdkVersion project.COMPILE_SDK_VERSION - - - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - } - buildTypes { - release { - minifyEnabled false - } - } - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} - -dependencies { - implementation 'com.tencent.shadow.coding:lint' -} - diff --git a/projects/sdk/core/loader/build.gradle b/projects/sdk/core/loader/build.gradle index eabc4cd49..9a7ef8110 100644 --- a/projects/sdk/core/loader/build.gradle +++ b/projects/sdk/core/loader/build.gradle @@ -1,5 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.tencent.shadow.internal.aar-to-jar' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' apply plugin: 'kotlin-android' @@ -8,50 +7,22 @@ apply plugin: 'kotlin-android-extensions' group 'com.tencent.shadow.core' android { - compileSdkVersion project.COMPILE_SDK_VERSION defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - buildConfigField("String","VERSION_NAME","\"${defaultConfig.versionName}\"") - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - + consumerProguardFiles 'plugin-loader-release.pro' } buildTypes { - debug { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - consumerProguardFiles 'plugin-loader-release.pro' - } - release { - consumerProguardFiles 'plugin-loader-release.pro' minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { - main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += project(':generate-delegate-code').buildDir.path + '/generated/DelegateCode/loader' - test.java.srcDirs += 'src/test/kotlin' } - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - // For Kotlin projects, compile to Java 6 instead of 7 - kotlinOptions { - jvmTarget = "1.6" - } } dependencies { @@ -62,7 +33,6 @@ dependencies { compileOnly project(':activity-container') compileOnly project(':common') api project(':load-parameters') - implementation 'com.tencent.shadow.coding:lint' } preBuild.dependsOn(project(":generate-delegate-code").getTasksByName("generateDelegateCode", false).first()) diff --git a/projects/sdk/core/manager/build.gradle b/projects/sdk/core/manager/build.gradle index 1bd4d4c49..48768c275 100644 --- a/projects/sdk/core/manager/build.gradle +++ b/projects/sdk/core/manager/build.gradle @@ -1,37 +1,14 @@ -apply plugin: 'com.android.library' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' group 'com.tencent.shadow.core' android { - compileSdkVersion project.COMPILE_SDK_VERSION - - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - testInstrumentationRunner "com.tencent.shadow.core.pluginmanager.CustomAndroidJUnitRunner" - - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } } testOptions { animationsDisabled = true } - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } } dependencies { @@ -46,7 +23,6 @@ dependencies { androidTestImplementation 'commons-io:commons-io:2.5' androidTestImplementation project(':common') - implementation 'com.tencent.shadow.coding:lint' implementation project(':utils') compileOnly project(':common') api project(':load-parameters') diff --git a/projects/sdk/core/runtime/build.gradle b/projects/sdk/core/runtime/build.gradle index dab24947c..410557564 100644 --- a/projects/sdk/core/runtime/build.gradle +++ b/projects/sdk/core/runtime/build.gradle @@ -8,39 +8,17 @@ * 因此暂定这个模块不混淆,保持Debug版和Release版无差别。 */ -apply plugin: 'com.android.library' -apply plugin: 'com.tencent.shadow.internal.aar-to-jar' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' group 'com.tencent.shadow.core' android { - compileSdkVersion project.COMPILE_SDK_VERSION - - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - - } - sourceSets { main.java.srcDirs += project(':generate-delegate-code').buildDir.path + '/generated/DelegateCode/runtime' } - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } } dependencies{ - implementation 'com.tencent.shadow.coding:lint' compileOnly project(':activity-container') } diff --git a/projects/sdk/dynamic/build.gradle b/projects/sdk/dynamic/build.gradle index 48f65da2b..581efcb62 100644 --- a/projects/sdk/dynamic/build.gradle +++ b/projects/sdk/dynamic/build.gradle @@ -17,6 +17,7 @@ buildscript { classpath "com.android.tools.build:gradle:$build_gradle_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.tencent.shadow.coding:aar-to-jar-plugin' + classpath 'com.tencent.shadow.coding:common-aar-settings' } } apply from: '../../../buildScripts/gradle/common.gradle' diff --git a/projects/sdk/dynamic/dynamic-apk/build.gradle b/projects/sdk/dynamic/dynamic-apk/build.gradle index 63889b07d..99b3c78d6 100644 --- a/projects/sdk/dynamic/dynamic-apk/build.gradle +++ b/projects/sdk/dynamic/dynamic-apk/build.gradle @@ -1,39 +1,8 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.tencent.shadow.internal.aar-to-jar' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' group 'com.tencent.shadow.dynamic' -android { - compileSdkVersion project.COMPILE_SDK_VERSION - - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} - - dependencies { - implementation 'com.tencent.shadow.coding:lint' implementation 'com.tencent.shadow.core:utils' compileOnly 'com.tencent.shadow.core:common' } diff --git a/projects/sdk/dynamic/dynamic-host-multi-loader-ext/build.gradle b/projects/sdk/dynamic/dynamic-host-multi-loader-ext/build.gradle index ce70095a7..5bbbd3826 100644 --- a/projects/sdk/dynamic/dynamic-host-multi-loader-ext/build.gradle +++ b/projects/sdk/dynamic/dynamic-host-multi-loader-ext/build.gradle @@ -1,42 +1,8 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.tencent.shadow.internal.aar-to-jar' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' group 'com.tencent.shadow.dynamic' -android { - compileSdkVersion project.COMPILE_SDK_VERSION - - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - - buildTypes { - debug { - minifyEnabled false - } - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} - - dependencies { - implementation 'com.tencent.shadow.coding:lint' compileOnly 'com.tencent.shadow.core:common' api project(':dynamic-host') } diff --git a/projects/sdk/dynamic/dynamic-host/build.gradle b/projects/sdk/dynamic/dynamic-host/build.gradle index afd6d5347..f62488ded 100644 --- a/projects/sdk/dynamic/dynamic-host/build.gradle +++ b/projects/sdk/dynamic/dynamic-host/build.gradle @@ -1,39 +1,8 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.tencent.shadow.internal.aar-to-jar' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' group 'com.tencent.shadow.dynamic' -android { - compileSdkVersion project.COMPILE_SDK_VERSION - - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} - - dependencies { - implementation 'com.tencent.shadow.coding:lint' implementation 'com.tencent.shadow.core:utils' compileOnly 'com.tencent.shadow.core:common' api project(':dynamic-apk') diff --git a/projects/sdk/dynamic/dynamic-loader-impl/build.gradle b/projects/sdk/dynamic/dynamic-loader-impl/build.gradle index 80e802728..873930f59 100644 --- a/projects/sdk/dynamic/dynamic-loader-impl/build.gradle +++ b/projects/sdk/dynamic/dynamic-loader-impl/build.gradle @@ -1,5 +1,4 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.tencent.shadow.internal.aar-to-jar' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' apply plugin: 'kotlin-android' @@ -8,46 +7,8 @@ apply plugin: 'kotlin-android-extensions' group 'com.tencent.shadow.dynamic' android { - compileSdkVersion project.COMPILE_SDK_VERSION - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - - } - - buildTypes { - debug { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - consumerProguardFiles 'plugin-loader-release.pro' - } - - release { - consumerProguardFiles 'plugin-loader-release.pro' - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - // For Kotlin projects, compile to Java 6 instead of 7 - kotlinOptions { - jvmTarget = "1.6" + consumerProguardFiles 'plugin-loader-release.pro' } } @@ -57,7 +18,6 @@ dependencies { implementation 'com.tencent.shadow.core:loader' compileOnly 'com.tencent.shadow.core:activity-container' - implementation 'com.tencent.shadow.coding:lint' compileOnly 'com.tencent.shadow.core:common' compileOnly project(':dynamic-host') compileOnly project(':dynamic-loader') diff --git a/projects/sdk/dynamic/dynamic-loader/build.gradle b/projects/sdk/dynamic/dynamic-loader/build.gradle index 8ba4e81bb..fd5005693 100644 --- a/projects/sdk/dynamic/dynamic-loader/build.gradle +++ b/projects/sdk/dynamic/dynamic-loader/build.gradle @@ -1,26 +1,3 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.tencent.shadow.internal.aar-to-jar' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' group 'com.tencent.shadow.dynamic' - -android { - compileSdkVersion project.COMPILE_SDK_VERSION - - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - - } - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} diff --git a/projects/sdk/dynamic/dynamic-manager-multi-loader-ext/build.gradle b/projects/sdk/dynamic/dynamic-manager-multi-loader-ext/build.gradle index a47c4afbb..5a58fe154 100644 --- a/projects/sdk/dynamic/dynamic-manager-multi-loader-ext/build.gradle +++ b/projects/sdk/dynamic/dynamic-manager-multi-loader-ext/build.gradle @@ -1,38 +1,8 @@ -apply plugin: 'com.android.library' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' group 'com.tencent.shadow.dynamic' -android { - compileSdkVersion project.COMPILE_SDK_VERSION - - - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} - dependencies { - implementation 'com.tencent.shadow.coding:lint' implementation 'com.tencent.shadow.core:manager' implementation project(':dynamic-manager') implementation project(':dynamic-loader') diff --git a/projects/sdk/dynamic/dynamic-manager/build.gradle b/projects/sdk/dynamic/dynamic-manager/build.gradle index 3871c4490..8e9fd6d15 100644 --- a/projects/sdk/dynamic/dynamic-manager/build.gradle +++ b/projects/sdk/dynamic/dynamic-manager/build.gradle @@ -1,37 +1,8 @@ -apply plugin: 'com.android.library' +apply plugin: 'com.tencent.shadow.internal.common-aar-settings' group 'com.tencent.shadow.dynamic' -android { - compileSdkVersion project.COMPILE_SDK_VERSION - - - defaultConfig { - minSdkVersion project.MIN_SDK_VERSION - targetSdkVersion project.TARGET_SDK_VERSION - versionCode project.VERSION_CODE - versionName project.VERSION_NAME - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - // Starting in version 4.2, AGP will use the Java 8 language level by default. - // To keep the old behavior, specify Java 7 explicitly. - // https://developer.android.com/studio/releases/gradle-plugin?hl=lt#java-8-default - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} - dependencies { - implementation 'com.tencent.shadow.coding:lint' compileOnly 'com.tencent.shadow.core:common' implementation 'com.tencent.shadow.core:manager' implementation project(':dynamic-loader') diff --git a/projects/test/plugin/particular-cases/multidex/test-multidex-lib/build.gradle b/projects/test/plugin/particular-cases/multidex/test-multidex-lib/build.gradle index 23fcaf12e..23f2359a5 100644 --- a/projects/test/plugin/particular-cases/multidex/test-multidex-lib/build.gradle +++ b/projects/test/plugin/particular-cases/multidex/test-multidex-lib/build.gradle @@ -23,10 +23,6 @@ android { lintOptions { abortOnError false } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } } dependencies {