Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

trying to solve CI errors

This commit is contained in:
Mariotaku Lee 2015-11-22 22:55:29 +08:00
parent c17f41a485
commit a2c5e3b3a4
16 changed files with 104 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -24,7 +24,7 @@ android:
jdk:
- oraclejdk7
sudo: required
sudo: false
env:
global:

98
build.gradle
View File

@ -25,4 +25,102 @@ allprojects {
maven { url 'https://jitpack.io' }
}
}
subprojects {
plugins.withId('com.android.library') {
android {
compileSdkVersion 23
buildToolsVersion '23.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'
}
}
}
plugins.withId('com.android.application') {
android {
compileSdkVersion 23
buildToolsVersion '23.0.1'
lintOptions {
abortOnError false
lintConfig rootProject.file('lint.xml')
}
signingConfigs {
debug {
File signingPropFile = rootProject.file('signing.properties')
if (signingPropFile.exists()) {
Properties signingProp = new Properties()
signingProp.load(signingPropFile.newDataInputStream())
storeFile file(signingProp.get("debug.storeFile"))
storePassword signingProp.get("debug.storePassword")
keyAlias signingProp.get("debug.keyAlias")
keyPassword signingProp.get("debug.keyPassword")
} else if (System.getenv('DEBUG_KEYSTORE_BASE64') != null) {
storeFile decodeKeyStoreFileFromBase64Env('DEBUG_KEYSTORE_BASE64')
storePassword System.getenv('DEBUG_KEYSTORE_PASSWORD')
keyAlias System.getenv('DEBUG_KEYSTORE_KEY_ALIAS')
keyPassword System.getenv('DEBUG_KEYSTORE_KEY_PASSWORD')
}
}
release {
File signingPropFile = rootProject.file('signing.properties')
if (signingPropFile.exists()) {
Properties signingProp = new Properties()
signingProp.load(signingPropFile.newDataInputStream())
storeFile file(signingProp.get("release.storeFile"))
storePassword signingProp.get("release.storePassword")
keyAlias signingProp.get("release.keyAlias")
keyPassword signingProp.get("release.keyPassword")
} else if (System.getenv('RELEASE_KEYSTORE_BASE64') != null) {
storeFile decodeKeyStoreFileFromBase64Env('RELEASE_KEYSTORE_BASE64')
storePassword System.getenv('RELEASE_KEYSTORE_PASSWORD')
keyAlias System.getenv('RELEASE_KEYSTORE_KEY_ALIAS')
keyPassword System.getenv('RELEASE_KEYSTORE_KEY_PASSWORD')
}
}
}
buildTypes {
debug {
if (rootProject.file('signing.properties').exists()
|| System.getenv('DEBUG_KEYSTORE_BASE64') != null) {
signingConfig signingConfigs.debug
}
}
release {
if (rootProject.file('signing.properties').exists()
|| System.getenv('RELEASE_KEYSTORE_BASE64') != null) {
signingConfig signingConfigs.release
}
}
}
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'
}
}
}
}

38
global.gradle
View File

@ -1,38 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
android {
compileSdkVersion 23
buildToolsVersion '23.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'
}
}

97
signing.gradle
View File

@ -1,97 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
apply plugin: 'com.android.application'
/**
* Gradle script for signing applications
* Just apply this script to your application build.gradle file.
* DON'T FORGET TO IGNORE signing.properties FROM YOUR VERSION CONTROL!!!
*
* @author Mariotaku Lee <mariotaku.lee@gmail.com>
*/
android {
signingConfigs {
debug {
File signingPropFile = rootProject.file('signing.properties')
if (signingPropFile.exists()) {
Properties signingProp = new Properties()
signingProp.load(signingPropFile.newDataInputStream())
storeFile file(signingProp.get("debug.storeFile"))
storePassword signingProp.get("debug.storePassword")
keyAlias signingProp.get("debug.keyAlias")
keyPassword signingProp.get("debug.keyPassword")
} else if (System.getenv('DEBUG_KEYSTORE_BASE64') != null) {
storeFile decodeKeyStoreFileFromBase64Env('DEBUG_KEYSTORE_BASE64')
storePassword System.getenv('DEBUG_KEYSTORE_PASSWORD')
keyAlias System.getenv('DEBUG_KEYSTORE_KEY_ALIAS')
keyPassword System.getenv('DEBUG_KEYSTORE_KEY_PASSWORD')
}
}
release {
File signingPropFile = rootProject.file('signing.properties')
if (signingPropFile.exists()) {
Properties signingProp = new Properties()
signingProp.load(signingPropFile.newDataInputStream())
storeFile file(signingProp.get("release.storeFile"))
storePassword signingProp.get("release.storePassword")
keyAlias signingProp.get("release.keyAlias")
keyPassword signingProp.get("release.keyPassword")
} else if (System.getenv('RELEASE_KEYSTORE_BASE64') != null) {
storeFile decodeKeyStoreFileFromBase64Env('RELEASE_KEYSTORE_BASE64')
storePassword System.getenv('RELEASE_KEYSTORE_PASSWORD')
keyAlias System.getenv('RELEASE_KEYSTORE_KEY_ALIAS')
keyPassword System.getenv('RELEASE_KEYSTORE_KEY_PASSWORD')
}
}
}
buildTypes {
debug {
if (rootProject.file('signing.properties').exists()
|| System.getenv('DEBUG_KEYSTORE_BASE64') != null) {
signingConfig signingConfigs.debug
}
}
release {
if (rootProject.file('signing.properties').exists()
|| System.getenv('RELEASE_KEYSTORE_BASE64') != null) {
signingConfig signingConfigs.release
}
}
}
}
def decodeKeyStoreFileFromBase64Env(String name) {
String keyStoreBase64 = System.getenv(name)
if (keyStoreBase64 == null) return null
File tempKeyStoreFile = File.createTempFile("tmp_ks_", ".jks", File.createTempDir())
FileOutputStream fos = null
try {
fos = new FileOutputStream(tempKeyStoreFile)
fos.write(keyStoreBase64.decodeBase64())
fos.flush()
} finally {
if (fos != null) {
fos.close()
}
}
return tempKeyStoreFile
}

1
twidere.component.common/build.gradle
View File

@ -19,7 +19,6 @@
apply plugin: 'com.android.library'
apply plugin: 'com.neenbedankt.android-apt'
apply from: rootProject.file('global.gradle')
android {
defaultConfig {

1
twidere.component.nyan/build.gradle
View File

@ -18,7 +18,6 @@
*/
apply plugin: 'com.android.library'
apply from: rootProject.file('global.gradle')
android {
defaultConfig {

2
twidere.donate.nyanwp.wear/build.gradle
View File

@ -18,8 +18,6 @@
*/
apply plugin: 'com.android.application'
apply from: rootProject.file('global.gradle')
apply from: rootProject.file('signing.gradle')
android {
defaultConfig {

2
twidere.donate.nyanwp/build.gradle
View File

@ -18,8 +18,6 @@
*/
apply plugin: 'com.android.application'
apply from: rootProject.file('global.gradle')
apply from: rootProject.file('signing.gradle')
android {
defaultConfig {

1
twidere.extension.launcher.compose/build.gradle
View File

@ -18,7 +18,6 @@
*/
apply plugin: 'com.android.application'
apply from: rootProject.file('global.gradle')
android {
defaultConfig {

2
twidere.extension.push.xiaomi/build.gradle
View File

@ -18,8 +18,6 @@
*/
apply plugin: 'com.android.application'
apply from: rootProject.file('global.gradle')
apply from: rootProject.file('signing.gradle')
android {
defaultConfig {

2
twidere.extension.shortener.gist/build.gradle
View File

@ -19,8 +19,6 @@
apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
apply from: rootProject.file('global.gradle')
apply from: rootProject.file('signing.gradle')
android {

4
twidere.extension.twitlonger/build.gradle
View File

@ -18,14 +18,12 @@
*/
apply plugin: 'com.android.application'
apply from: rootProject.file('global.gradle')
apply from: rootProject.file('signing.gradle')
android {
defaultConfig {
applicationId "org.mariotaku.extension.twitlonger"
minSdkVersion 14
targetSdkVersion 22
targetSdkVersion 23
versionCode 6
versionName "1.5"
}

1
twidere.library.extension/build.gradle
View File

@ -18,7 +18,6 @@
*/
apply plugin: 'com.android.library'
apply from: rootProject.file('global.gradle')
android {
defaultConfig {

5
twidere.wear/build.gradle
View File

@ -19,9 +19,6 @@
apply plugin: 'com.android.application'
apply from: rootProject.file('global.gradle')
apply from: rootProject.file('signing.gradle')
android {
defaultConfig {
applicationId "org.mariotaku.twidere"
@ -42,5 +39,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.google.android.support:wearable:1.3.0'
compile 'com.google.android.gms:play-services-wearable:8.1.0'
compile 'com.google.android.gms:play-services-wearable:8.3.0'
}

4
twidere/build.gradle
View File

@ -5,8 +5,6 @@ import java.text.SimpleDateFormat
apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
apply plugin: 'androidsvgdrawable'
apply from: rootProject.file('global.gradle')
apply from: rootProject.file('signing.gradle')
android {
@ -34,6 +32,8 @@ android {
versionNameSuffix String.format(" (dev %s)", format.format(new Date()))
}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd")
versionNameSuffix String.format(" (dev %s)", format.format(new Date()))
}

2
twidere/src/main/res/layout/activity_compose.xml
View File

@ -60,7 +60,7 @@
android:background="@null"
android:gravity="top"
android:hint="@string/status_hint"
android:inputType="textMultiLine|textShortMessage"
android:inputType="textMultiLine|textLongMessage"
android:minLines="6"
android:padding="@dimen/element_spacing_normal"
android:scrollbars="vertical"