diff --git a/.travis.yml b/.travis.yml index 9043c6a13..b09e3d075 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_install: install: - ./travis/scripts/fetch_private_files.sh - - cat ./travis/configs/gradle.properties > ./gradle.properties + - cat ./travis/configs/gradle.properties >> ./gradle.properties before_script: # Validate if patches work @@ -75,7 +75,7 @@ deploy: tags: true # Publish to Google Play store - provider: script - script: ./gradlew publishGoogleRelease + script: ./gradlew twidere:publishGoogleRelease on: repo: TwidereProject/Twidere-Android tags: true diff --git a/build.gradle b/build.gradle index 400216d28..25a5c4da2 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,9 @@ allprojects { projectGroupId = 'org.mariotaku.twidere' projectVersionCode = 387 projectVersionName = '3.6.27' + + globalCompileSdkVersion = 26 + globalBuildToolsVersion = '26.0.1' } repositories { @@ -80,61 +83,9 @@ subprojects { AbstractTask : '0.9.5', Dagger : '2.11', ] - } - } - afterEvaluate { project -> - - if (project.hasProperty('android')) { - android { - compileSdkVersion 26 - buildToolsVersion '26.0.1' - - lintOptions { - abortOnError false - lintConfig rootProject.file('lint.xml') - } - - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - exclude 'META-INF/LICENSE' - exclude 'META-INF/LICENSE.txt' - exclude 'META-INF/license.txt' - exclude 'META-INF/NOTICE' - exclude 'META-INF/NOTICE.txt' - exclude 'META-INF/notice.txt' - exclude 'META-INF/ASL2.0' - } - - def file = rootProject.file('private/signing.properties') - if (project.plugins.hasPlugin('com.android.application') && file.exists()) { - if (android.hasProperty('buildTypes')) { - android.buildTypes.each { buildType -> - def cfg = signingConfigs.maybeCreate(buildType.name) - loadSigningConfig(cfg, file) - buildType.signingConfig = cfg - } - } - if (android.hasProperty('applicationVariants')) { - android.applicationVariants.each { buildType -> - def cfg = signingConfigs.maybeCreate(buildType.name) - loadSigningConfig(cfg, file) - buildType.signingConfig = cfg - } - } - } - } } } } - -def loadSigningConfig(def cfg, def file) { - Properties signingProp = new Properties() - signingProp.load(file.newInputStream()) - cfg.setStoreFile(rootProject.file(signingProp.get('storeFile'))) - cfg.setStorePassword((String) signingProp.get('storePassword')) - cfg.setKeyAlias((String) signingProp.get('keyAlias')) - cfg.setKeyPassword((String) signingProp.get('keyPassword')) -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6f6db09e6..6dd8a6b05 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ --Dorg.gradle.jvmargs=-Xmx3.5g \ No newline at end of file +org.gradle.jvmargs=-Xmx3584m \ No newline at end of file diff --git a/travis/configs/gradle.properties b/travis/configs/gradle.properties index 5455c0489..4f53435e8 100644 --- a/travis/configs/gradle.properties +++ b/travis/configs/gradle.properties @@ -15,8 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Travis has 4g memory for container-based instances, 7.5g for VM-based instances -org.gradle.jvmargs=-Xmx3584m org.gradle.parallel=false kotlin.incremental=false kotlin.compiler.execution.strategy=in-process \ No newline at end of file diff --git a/twidere.component.common/build.gradle b/twidere.component.common/build.gradle index a36c8f40f..8a4efac10 100644 --- a/twidere.component.common/build.gradle +++ b/twidere.component.common/build.gradle @@ -44,6 +44,10 @@ buildscript { } android { + + compileSdkVersion globalCompileSdkVersion + buildToolsVersion globalBuildToolsVersion + defaultConfig { minSdkVersion 14 targetSdkVersion 26 diff --git a/twidere.component.nyan/build.gradle b/twidere.component.nyan/build.gradle index 7afdb4343..362b61684 100644 --- a/twidere.component.nyan/build.gradle +++ b/twidere.component.nyan/build.gradle @@ -22,6 +22,10 @@ apply plugin: 'com.android.library' android { + + compileSdkVersion globalCompileSdkVersion + buildToolsVersion globalBuildToolsVersion + defaultConfig { minSdkVersion 14 targetSdkVersion 26 diff --git a/twidere.wear/build.gradle b/twidere.wear/build.gradle index 09ef9b6c5..d8a0f90b8 100644 --- a/twidere.wear/build.gradle +++ b/twidere.wear/build.gradle @@ -20,6 +20,10 @@ apply plugin: 'com.android.application' android { + + compileSdkVersion globalCompileSdkVersion + buildToolsVersion globalBuildToolsVersion + defaultConfig { applicationId "org.mariotaku.twidere" minSdkVersion 20 diff --git a/twidere/build.gradle b/twidere/build.gradle index 161264029..9a0d405f5 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -32,6 +32,9 @@ buildscript { android { + compileSdkVersion globalCompileSdkVersion + buildToolsVersion globalBuildToolsVersion + defaultConfig { applicationId "org.mariotaku.twidere" minSdkVersion 14 @@ -68,13 +71,30 @@ android { } } + signingConfigs { + twidere { + def file = rootProject.file('private/signing.properties') + if (!file.exists()) return + Properties signingProp = new Properties() + signingProp.load(file.newInputStream()) + storeFile = rootProject.file(signingProp.get('storeFile')) + storePassword = (String) signingProp.get('storePassword') + keyAlias = (String) signingProp.get('keyAlias') + keyPassword = (String) signingProp.get('keyPassword') + } + } + buildTypes { debug { + signingConfig signingConfigs.twidere + minifyEnabled false shrinkResources false resValue("bool", "debug", "true") } release { + signingConfig signingConfigs.twidere + minifyEnabled false shrinkResources false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' @@ -92,6 +112,19 @@ android { unitTests.returnDefaultValues = true } + lintOptions { + abortOnError false + lintConfig rootProject.file('lint.xml') + } + + packagingOptions { + exclude 'META-INF/DEPENDENCIES' + exclude 'META-INF/README' + exclude 'META-INF/INDEX.LIST' + exclude 'LICENSE​-​junit​.​txt' + exclude 'sdk-version.​txt' + } + } repositories {