From db72cbc25b8a7336a2306b8ea19159cc27e388e9 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 2 Oct 2014 23:32:58 +0100 Subject: Revert "Add BuildConfig stuff instead of msg_version" This reverts commit d2eb6b37b3910f404f229625a39a11954fac681d. --- app/app.iml | 2 +- app/build.gradle | 33 ++++------------------ app/src/main/java/org/connectbot/HelpActivity.java | 6 +--- .../main/java/org/connectbot/WizardActivity.java | 9 ++---- app/src/main/res/layout/act_help.xml | 2 +- app/src/main/res/layout/wiz_eula.xml | 2 +- build.gradle | 3 +- 7 files changed, 13 insertions(+), 44 deletions(-) diff --git a/app/app.iml b/app/app.iml index 213f0e3..c1b11c3 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + diff --git a/app/build.gradle b/app/build.gradle index c4f73db..e55ca40 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,35 +1,20 @@ -import java.text.SimpleDateFormat -import org.ajoberstar.grgit.Grgit - apply plugin: 'android-sdk-manager' apply plugin: 'com.android.application' -apply plugin: 'org.ajoberstar.release-opinion' apply from: '../config/quality.gradle' -release { - grgit = Grgit.open(project.file('..')) -} - android { compileSdkVersion 20 buildToolsVersion "20.0.0" defaultConfig { applicationId "org.connectbot" - minSdkVersion 4 targetSdkVersion 15 - - versionCode 365 - versionName "${project.version.toString()}" - compileOptions { sourceCompatibility JavaVersion.VERSION_1_5 targetCompatibility JavaVersion.VERSION_1_5 } - buildConfigField "String", "BUILD_TIME", "\"${buildTime()}\"" - ndk { moduleName "com_google_ase_Exec" ldLibs "log" @@ -45,7 +30,7 @@ android { } signingConfigs { - releaseSigning + release } buildTypes { @@ -54,7 +39,7 @@ android { proguardFiles 'proguard.cfg' if (project.hasProperty('keystorePassword')) { - signingConfig signingConfigs.releaseSigning + signingConfig signingConfigs.release } } @@ -64,15 +49,9 @@ android { } } -def buildTime() { - def df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'"); - df.setTimeZone(TimeZone.getTimeZone("UTC")); - return df.format(new Date()); -} - if (project.hasProperty('keystorePassword')) { - android.signingConfigs.releaseSigning.storeFile file(keystoreFile) - android.signingConfigs.releaseSigning.storePassword keystorePassword - android.signingConfigs.releaseSigning.keyAlias keystoreAlias - android.signingConfigs.releaseSigning.keyPassword keystorePassword + android.signingConfigs.release.storeFile file(keystoreFile) + android.signingConfigs.release.storePassword keystorePassword + android.signingConfigs.release.keyAlias keystoreAlias + android.signingConfigs.release.keyPassword keystorePassword } diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java index f597d7f..d82777d 100644 --- a/app/src/main/java/org/connectbot/HelpActivity.java +++ b/app/src/main/java/org/connectbot/HelpActivity.java @@ -28,7 +28,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.LinearLayout; -import android.widget.TextView; /** * @author Kenny Root @@ -50,10 +49,7 @@ public class HelpActivity extends Activity { getResources().getText(R.string.title_help))); AssetManager am = this.getAssets(); - LinearLayout content = (LinearLayout) findViewById(R.id.topics); - - TextView versionString = (TextView) findViewById(R.id.version); - versionString.setText(BuildConfig.VERSION_NAME); + LinearLayout content = (LinearLayout)this.findViewById(R.id.topics); try { for (String name : am.list(HELPDIR)) { diff --git a/app/src/main/java/org/connectbot/WizardActivity.java b/app/src/main/java/org/connectbot/WizardActivity.java index 711043d..35a60ca 100644 --- a/app/src/main/java/org/connectbot/WizardActivity.java +++ b/app/src/main/java/org/connectbot/WizardActivity.java @@ -26,7 +26,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import android.widget.TextView; import android.widget.ViewFlipper; /** @@ -44,15 +43,11 @@ public class WizardActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.act_wizard); - flipper = (ViewFlipper) findViewById(R.id.wizard_flipper); + this.flipper = (ViewFlipper) findViewById(R.id.wizard_flipper); // inflate the layout for EULA step LayoutInflater inflater = LayoutInflater.from(this); - - View eula = inflater.inflate(R.layout.wiz_eula, flipper, false); - TextView versionString = (TextView) eula.findViewById(R.id.version); - versionString.setText(BuildConfig.VERSION_NAME); - flipper.addView(eula); + this.flipper.addView(inflater.inflate(R.layout.wiz_eula, this.flipper, false)); // Add a view for each help topic we want the user to see. String[] topics = getResources().getStringArray(R.array.list_wizard_topics); diff --git a/app/src/main/res/layout/act_help.xml b/app/src/main/res/layout/act_help.xml index 8276842..833aefb 100644 --- a/app/src/main/res/layout/act_help.xml +++ b/app/src/main/res/layout/act_help.xml @@ -34,9 +34,9 @@ > diff --git a/build.gradle b/build.gradle index 993b92b..b9ba100 100644 --- a/build.gradle +++ b/build.gradle @@ -8,9 +8,8 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:0.13.+' + classpath 'com.android.tools.build:gradle:0.13.0' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+' - classpath 'org.ajoberstar:gradle-git:0.11.+' } } -- cgit v1.2.3