removed crashlytics completely
migrated publish process to fastlane
This commit is contained in:
Mariotaku Lee
parent
e1949ea926
commit
dcfdb9f948
|
|
@ -56,10 +56,9 @@ before_script:
|
|||
- ./travis/scripts/patch_sources.sh
|
||||
# Validate if Google components fetched successfully
|
||||
- ./travis/scripts/test_private_files.sh
|
||||
- ./gradlew twidere:tasks
|
||||
|
||||
script:
|
||||
- ./gradlew clean build --stacktrace
|
||||
- ./gradlew clean build
|
||||
|
||||
after_failure:
|
||||
- ./travis/scripts/upload_error_logs.sh
|
||||
|
|
@ -76,7 +75,11 @@ deploy:
|
|||
tags: true
|
||||
# Publish to Google Play store
|
||||
- provider: script
|
||||
script: ./gradlew twidere:publishGoogleRelease
|
||||
script:
|
||||
- set -o allexport
|
||||
- source ./twidere/src/google/.supplyrc
|
||||
- fastlane supply run
|
||||
- set +o allexport
|
||||
on:
|
||||
repo: TwidereProject/Twidere-Android
|
||||
tags: true
|
||||
|
|
|
|||
|
|
@ -38,8 +38,6 @@ subprojects {
|
|||
kotlinVersion = '1.1.4-3'
|
||||
pluginVersions = [
|
||||
AndroidSvgDrawable: '3.0.0',
|
||||
Fabric : '1.22.1',
|
||||
PlayPublisher : '1.1.5',
|
||||
PlayServices : '3.1.0',
|
||||
]
|
||||
libVersions = [
|
||||
|
|
@ -51,7 +49,6 @@ subprojects {
|
|||
ObjectCursor : '0.9.20',
|
||||
PlayServices : '11.2.0',
|
||||
MapsUtils : '0.5',
|
||||
Crashlyrics : '2.6.8',
|
||||
DropboxCoreSdk : '3.0.3',
|
||||
GoogleDriveApi : 'v3-rev61-1.22.0',
|
||||
Exoplayer : 'r2.2.0',
|
||||
|
|
|
|||
|
|
@ -6,10 +6,6 @@ apply plugin: 'kotlin-kapt'
|
|||
apply plugin: 'kotlin-android-extensions'
|
||||
apply plugin: 'androidsvgdrawable'
|
||||
|
||||
// START Non-FOSS component
|
||||
apply plugin: 'com.github.triplet.play'
|
||||
// END Non-FOSS component
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
|
|
@ -24,7 +20,6 @@ buildscript {
|
|||
}
|
||||
|
||||
// START Non-FOSS component
|
||||
classpath "com.github.triplet.gradle:play-publisher:${pluginVersions['PlayPublisher']}"
|
||||
classpath "com.google.gms:google-services:${pluginVersions['PlayServices']}"
|
||||
// END Non-FOSS component
|
||||
}
|
||||
|
|
@ -284,11 +279,4 @@ task svgToMipmap(type: SvgDrawableTask) {
|
|||
outputFormat = 'PNG'
|
||||
|
||||
outputType = 'mipmap'
|
||||
}
|
||||
|
||||
// START Non-FOSS component
|
||||
play {
|
||||
jsonFile = rootProject.file('private/google_play_publish.json')
|
||||
track = 'beta'
|
||||
}
|
||||
// END Non-FOSS component
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
050d282caf0af4439fc71a67b474d237cf8bbe8b
|
||||
90f48168ccdb1cbab4f42b5a0918ce424f6042bb
|
||||
|
|
|
|||
|
|
@ -565,10 +565,6 @@
|
|||
android:launchMode="singleTop"
|
||||
android:theme="@style/Theme.Nyan"
|
||||
android:windowSoftInputMode="stateAlwaysHidden"/>
|
||||
<activity
|
||||
android:name=".activity.UsageStatisticsActivity"
|
||||
android:label="@string/usage_statistics"
|
||||
android:theme="@style/Theme.Twidere"/>
|
||||
<activity
|
||||
android:name=".activity.ImageCropperActivity"
|
||||
android:label="@string/title_crop_image"
|
||||
|
|
|
|||
|
|
@ -1,52 +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/>.
|
||||
*/
|
||||
|
||||
package org.mariotaku.twidere.activity
|
||||
|
||||
import android.os.Bundle
|
||||
import android.support.v4.app.Fragment
|
||||
import org.mariotaku.kpreferences.contains
|
||||
import org.mariotaku.kpreferences.get
|
||||
import org.mariotaku.kpreferences.set
|
||||
import org.mariotaku.twidere.R
|
||||
import org.mariotaku.twidere.constant.IntentConstants.EXTRA_RESID
|
||||
import org.mariotaku.twidere.constant.usageStatisticsKey
|
||||
import org.mariotaku.twidere.fragment.SettingsDetailsFragment
|
||||
|
||||
class UsageStatisticsActivity : BaseActivity() {
|
||||
|
||||
override fun onDestroy() {
|
||||
if (isFinishing && usageStatisticsKey !in preferences) {
|
||||
preferences[usageStatisticsKey] = preferences[usageStatisticsKey]
|
||||
}
|
||||
super.onDestroy()
|
||||
}
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
val fragmentArgs = Bundle()
|
||||
fragmentArgs.putInt(EXTRA_RESID, R.xml.preferences_usage_statistics)
|
||||
val fm = supportFragmentManager
|
||||
val ft = fm.beginTransaction()
|
||||
ft.replace(android.R.id.content, Fragment.instantiate(this,
|
||||
SettingsDetailsFragment::class.java.name, fragmentArgs))
|
||||
ft.commit()
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -4,14 +4,6 @@
|
|||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:title="@string/other_settings">
|
||||
|
||||
<Preference
|
||||
android:fragment="org.mariotaku.twidere.fragment.SettingsDetailsFragment"
|
||||
android:title="@string/usage_statistics">
|
||||
<extra
|
||||
android:name="resid"
|
||||
android:value="@xml/preferences_usage_statistics"/>
|
||||
</Preference>
|
||||
|
||||
<org.mariotaku.twidere.preference.SettingsImportExportPreference
|
||||
android:key="import_export_settings"
|
||||
android:title="@string/import_export_settings"/>
|
||||
|
|
@ -32,6 +24,7 @@
|
|||
android:name="should_recreate"
|
||||
android:value="true"/>
|
||||
</SwitchPreferenceCompat>
|
||||
|
||||
<org.mariotaku.twidere.preference.EntrySummaryListPreference
|
||||
android:defaultValue=""
|
||||
android:entries="@array/values_app_languages"
|
||||
|
|
@ -43,4 +36,8 @@
|
|||
android:value="true"/>
|
||||
</org.mariotaku.twidere.preference.EntrySummaryListPreference>
|
||||
|
||||
<Preference
|
||||
android:fragment="org.mariotaku.twidere.fragment.NetworkDiagnosticsFragment"
|
||||
android:title="@string/network_diagnostics"/>
|
||||
|
||||
</PreferenceScreen>
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
~ 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/>.
|
||||
-->
|
||||
|
||||
<!--suppress AndroidElementNotAllowed -->
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<SwitchPreferenceCompat
|
||||
android:defaultValue="false"
|
||||
android:key="usage_statistics"
|
||||
android:order="11"
|
||||
android:title="@string/usage_statistics"/>
|
||||
|
||||
<SwitchPreferenceCompat
|
||||
android:defaultValue="@bool/debug"
|
||||
android:key="bug_reports"
|
||||
android:order="12"
|
||||
android:summary="@string/bug_reports_summary"
|
||||
android:title="@string/bug_reports"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="org.mariotaku.twidere.fragment.NetworkDiagnosticsFragment"
|
||||
android:order="13"
|
||||
android:title="@string/network_diagnostics"/>
|
||||
|
||||
<Preference
|
||||
android:layout="@layout/header_usage_statistics"
|
||||
android:order="20"/>
|
||||
|
||||
<Preference
|
||||
android:title="@string/projects_we_took_part">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="https://github.com/mariotaku/twidere/wiki/Research-Projects"/>
|
||||
</Preference>
|
||||
|
||||
</PreferenceScreen>
|
||||
Loading…
Reference in New Issue