aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/build.gradle33
-rw-r--r--app/src/main/java/org/connectbot/HelpActivity.java6
-rw-r--r--app/src/main/java/org/connectbot/WizardActivity.java9
-rw-r--r--app/src/main/res/layout/act_help.xml2
-rw-r--r--app/src/main/res/layout/wiz_eula.xml2
-rw-r--r--build.gradle3
6 files changed, 43 insertions, 12 deletions
diff --git a/app/build.gradle b/app/build.gradle
index e55ca40..c4f73db 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,20 +1,35 @@
+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"
@@ -30,7 +45,7 @@ android {
}
signingConfigs {
- release
+ releaseSigning
}
buildTypes {
@@ -39,7 +54,7 @@ android {
proguardFiles 'proguard.cfg'
if (project.hasProperty('keystorePassword')) {
- signingConfig signingConfigs.release
+ signingConfig signingConfigs.releaseSigning
}
}
@@ -49,9 +64,15 @@ 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.release.storeFile file(keystoreFile)
- android.signingConfigs.release.storePassword keystorePassword
- android.signingConfigs.release.keyAlias keystoreAlias
- android.signingConfigs.release.keyPassword keystorePassword
+ android.signingConfigs.releaseSigning.storeFile file(keystoreFile)
+ android.signingConfigs.releaseSigning.storePassword keystorePassword
+ android.signingConfigs.releaseSigning.keyAlias keystoreAlias
+ android.signingConfigs.releaseSigning.keyPassword keystorePassword
}
diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java
index d82777d..f597d7f 100644
--- a/app/src/main/java/org/connectbot/HelpActivity.java
+++ b/app/src/main/java/org/connectbot/HelpActivity.java
@@ -28,6 +28,7 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.LinearLayout;
+import android.widget.TextView;
/**
* @author Kenny Root
@@ -49,7 +50,10 @@ public class HelpActivity extends Activity {
getResources().getText(R.string.title_help)));
AssetManager am = this.getAssets();
- LinearLayout content = (LinearLayout)this.findViewById(R.id.topics);
+ LinearLayout content = (LinearLayout) findViewById(R.id.topics);
+
+ TextView versionString = (TextView) findViewById(R.id.version);
+ versionString.setText(BuildConfig.VERSION_NAME);
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 35a60ca..711043d 100644
--- a/app/src/main/java/org/connectbot/WizardActivity.java
+++ b/app/src/main/java/org/connectbot/WizardActivity.java
@@ -26,6 +26,7 @@ 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;
/**
@@ -43,11 +44,15 @@ public class WizardActivity extends Activity {
super.onCreate(savedInstanceState);
setContentView(R.layout.act_wizard);
- this.flipper = (ViewFlipper) findViewById(R.id.wizard_flipper);
+ flipper = (ViewFlipper) findViewById(R.id.wizard_flipper);
// inflate the layout for EULA step
LayoutInflater inflater = LayoutInflater.from(this);
- this.flipper.addView(inflater.inflate(R.layout.wiz_eula, this.flipper, false));
+
+ 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);
// 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 833aefb..8276842 100644
--- a/app/src/main/res/layout/act_help.xml
+++ b/app/src/main/res/layout/act_help.xml
@@ -34,9 +34,9 @@
>
<TextView
+ android:id="@+id/version"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="@string/msg_version"
android:paddingTop="2dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:gravity="right"
diff --git a/app/src/main/res/layout/wiz_eula.xml b/app/src/main/res/layout/wiz_eula.xml
index 06b7c56..463b063 100644
--- a/app/src/main/res/layout/wiz_eula.xml
+++ b/app/src/main/res/layout/wiz_eula.xml
@@ -84,10 +84,10 @@
/>
<TextView
+ android:id="@+id/version"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
- android:text="@string/msg_version"
android:textAppearance="?android:attr/textAppearanceSmall"
/>
diff --git a/build.gradle b/build.gradle
index b9ba100..993b92b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,9 @@ buildscript {
}
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.13.0'
+ classpath 'com.android.tools.build:gradle:0.13.+'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
+ classpath 'org.ajoberstar:gradle-git:0.11.+'
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 13:16:03 +0000