You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2018/02/01 12:21:51 UTC
[3/4] incubator-taverna-mobile git commit: Update butterknife for
latest Android. Change support library version.
Update butterknife for latest Android. Change support library version.
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/bd7a6b4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/bd7a6b4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/bd7a6b4f
Branch: refs/heads/master
Commit: bd7a6b4f5ea0e550fbf367f82a075a183a433e36
Parents: 58a3141
Author: Ian Dunlop <ia...@manchester.ac.uk>
Authored: Thu Feb 1 12:20:53 2018 +0000
Committer: Ian Dunlop <ia...@manchester.ac.uk>
Committed: Thu Feb 1 12:20:53 2018 +0000
----------------------------------------------------------------------
app/build.gradle | 2 +-
.../mobile/ui/anouncements/AnnouncementFragment.java | 10 +++++-----
.../FavouriteWorkflowDetailFragment.java | 8 ++++----
.../mobile/ui/workflowdetail/WorkflowDetailFragment.java | 8 ++++----
app/src/main/res/values/strings.xml | 2 +-
build.gradle | 8 ++++----
gradle/wrapper/gradle-wrapper.properties | 4 ++--
7 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd7a6b4f/app/build.gradle
----------------------------------------------------------------------
diff --git a/app/build.gradle b/app/build.gradle
index 0bf40b4..441b48d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,6 @@ apply from: '../config/quality/quality.gradle'
android {
compileSdkVersion rootProject.ext.compileSdkVersion
- buildToolsVersion rootProject.ext.buildToolsVersion
useLibrary 'org.apache.http.legacy'
lintOptions {
abortOnError false
@@ -48,6 +47,7 @@ android {
unitTests.returnDefaultValues = true
}
+ buildToolsVersion '27.0.3'
}
repositories {
jcenter()
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd7a6b4f/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
index 7b0e853..8c99a4a 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/anouncements/AnnouncementFragment.java
@@ -215,11 +215,11 @@ public class AnnouncementFragment extends Fragment implements RecyclerItemClickL
LayoutInflater inflater = getActivity().getLayoutInflater();
View dialogView = inflater.inflate(R.layout.detail_annoucement_dialog_layout, null);
dialogBuilder.setView(dialogView);
- TextView title = ButterKnife.findById(dialogView, R.id.tvDialogTitle);
- TextView date = ButterKnife.findById(dialogView, R.id.tvDialogDate);
- TextView author = ButterKnife.findById(dialogView, R.id.tvDialogAuthor);
- WebView text = ButterKnife.findById(dialogView, R.id.wvDialogText);
- Button buttonOk = ButterKnife.findById(dialogView, R.id.bDialogOK);
+ TextView title = dialogView.findViewById(R.id.tvDialogTitle);
+ TextView date = dialogView.findViewById(R.id.tvDialogDate);
+ TextView author = dialogView.findViewById(R.id.tvDialogAuthor);
+ WebView text = dialogView.findViewById(R.id.wvDialogText);
+ Button buttonOk = dialogView.findViewById(R.id.bDialogOK);
buttonOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd7a6b4f/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
index 2a53536..de44e59 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/favouriteworkflowdetail/FavouriteWorkflowDetailFragment.java
@@ -306,10 +306,10 @@ public class FavouriteWorkflowDetailFragment extends Fragment
dialogBuilder.setView(dialogView);
- TextView title = ButterKnife.findById(dialogView, R.id.tvDialogTitle);
- TextView date = ButterKnife.findById(dialogView, R.id.tvDialogDate);
- WebView text = ButterKnife.findById(dialogView, R.id.wvDialogText);
- Button buttonOk = ButterKnife.findById(dialogView, R.id.bDialogOK);
+ TextView title = dialogView.findViewById(R.id.tvDialogTitle);
+ TextView date = dialogView.findViewById(R.id.tvDialogDate);
+ WebView text = dialogView.findViewById(R.id.wvDialogText);
+ Button buttonOk = dialogView.findViewById(R.id.bDialogOK);
buttonOk.setOnClickListener(new View.OnClickListener() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd7a6b4f/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
index 791c45a..d6920a5 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java
@@ -307,10 +307,10 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv
dialogBuilder.setView(dialogView);
- TextView title = ButterKnife.findById(dialogView, R.id.tvDialogTitle);
- TextView date = ButterKnife.findById(dialogView, R.id.tvDialogDate);
- WebView text = ButterKnife.findById(dialogView, R.id.wvDialogText);
- Button buttonOk = ButterKnife.findById(dialogView, R.id.bDialogOK);
+ TextView title = dialogView.findViewById(R.id.tvDialogTitle);
+ TextView date = dialogView.findViewById(R.id.tvDialogDate);
+ WebView text = dialogView.findViewById(R.id.wvDialogText);
+ Button buttonOk = dialogView.findViewById(R.id.bDialogOK);
buttonOk.setOnClickListener(new View.OnClickListener() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd7a6b4f/app/src/main/res/values/strings.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e5e1069..39dd2dd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,7 +102,7 @@ limitations under the License.
<string name="emailerr">Username must not be empty</string>
<string name="passworderr">Password must not be empty</string>
<string name="version_number">v1.0</string>
- <string name="about">Mobile Application for managing Taverna workflows.\n\nCopyright © 2015–2016
+ <string name="about">Mobile Application for managing Taverna workflows.\n\nCopyright © 2015–2018
The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
</string>
<string name="about2">View, run and download workflows on your Android mobile device.</string>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd7a6b4f/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index f846b55..005c33c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,8 @@ buildscript {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
- classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-20171223.061039-23'
+ classpath 'com.android.tools.build:gradle:3.1.0-beta1'
+ classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-SNAPSHOT'
classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.1"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -39,11 +39,11 @@ ext {
buildToolsVersion = '26.0.2'
// App dependencies
- supportLibraryVersion = '26.1.0'
+ supportLibraryVersion = '27.0.2'
raizLabsDBFlow = '3.1.1'
retrofitVersionLatest = '2.3.0'
okHttp3Version = '3.9.1'
- butterKnifeVersion = '8.8.1'
+ butterKnifeVersion = '9.0.0-SNAPSHOT'
stetho='1.5.0'
leakcanary ='1.5.4'
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd7a6b4f/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6467d51..2796080 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 26 17:10:21 IST 2018
+#Thu Feb 01 11:40:02 GMT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip