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 2016/10/13 13:26:57 UTC
incubator-taverna-mobile git commit: Actual licence types for
dependencies
Repository: incubator-taverna-mobile
Updated Branches:
refs/heads/ian_licence_data 467c34371 -> 8a6819eed
Actual licence types for dependencies
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/8a6819ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/8a6819ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/8a6819ee
Branch: refs/heads/ian_licence_data
Commit: 8a6819eedc9b80c0ad7f67182eab840e9b3c44fd
Parents: 467c343
Author: Ian Dunlop <ia...@manchester.ac.uk>
Authored: Thu Oct 13 14:23:09 2016 +0100
Committer: Ian Dunlop <ia...@manchester.ac.uk>
Committed: Thu Oct 13 14:23:09 2016 +0100
----------------------------------------------------------------------
.../taverna/mobile/ui/licences/LicenceRecyclerViewAdapter.java | 2 +-
.../taverna/mobile/ui/licences/licence/LicenceContent.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8a6819ee/app/src/main/java/org/apache/taverna/mobile/ui/licences/LicenceRecyclerViewAdapter.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/licences/LicenceRecyclerViewAdapter.java b/app/src/main/java/org/apache/taverna/mobile/ui/licences/LicenceRecyclerViewAdapter.java
index cf1a980..2d37cec 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/licences/LicenceRecyclerViewAdapter.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/licences/LicenceRecyclerViewAdapter.java
@@ -38,7 +38,7 @@ public class LicenceRecyclerViewAdapter extends RecyclerView.Adapter<LicenceRecy
holder.mItem = mValues.get(position);
holder.mLicenceNameView.setText(mValues.get(position).getName());
holder.mLicenceVersionView.setText(mValues.get(position).getVersion());
- holder.mLicenceLicenceView.setText("Unknown");
+ holder.mLicenceLicenceView.setText(mValues.get(position).getLicence());
holder.mView.setOnClickListener(new View.OnClickListener() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/8a6819ee/app/src/main/java/org/apache/taverna/mobile/ui/licences/licence/LicenceContent.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/licences/licence/LicenceContent.java b/app/src/main/java/org/apache/taverna/mobile/ui/licences/licence/LicenceContent.java
index adbca0d..f43f790 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/licences/licence/LicenceContent.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/licences/licence/LicenceContent.java
@@ -18,7 +18,7 @@ public class LicenceContent {
* An array of licence items.
*/
public static final List<LicenceItem> ITEMS = new ArrayList<LicenceItem>();
- private static String licence_json = "[{'library': 'dropbox-android-sdk','version': '1.6.3'}, {'library': 'json_simple','version': '1.1'}, {'libary': 'sjxp','version': '2.2'}, {'library': 'com.android.support:appcompat','version': 'v7:23.3.0'}, {'library': 'com.android.support:cardview','version': 'v7:23.3.0'}, {'library': 'com.android.support:recyclerview','version': 'v7:23.3.0'}, {'library': 'com.android.support:support','version': 'v4:23.3.0'}, {'library': 'com.android.support:design','version': ':23.3.0'}, {'library': 'com.squareup.retrofit2:retrofit','version': '2.0.2'}, {'library': 'com.squareup.retrofit2:adapter-rxjava', 'version': '2.0.2'}, { 'library': 'com.squareup.okhttp3:logging-interceptor', 'version': '3.2.0'}, { 'library': 'com.squareup.retrofit2:converter-simplexml', 'version': '2.0.2'}, { 'library': 'com.jakewharton:butterknife', 'version': '8.0.1'}, { 'library': 'com.jakewharton:butterknife-compiler', 'version': '8.0.1'}, {'library':
'io.reactivex:rxandroid', 'version': '1.2.0'}, {'library': 'io.reactivex:rxjava', 'version': '1.1.4'}, {'library': 'org.simpleframework:simple-xml', 'version': '2.7. +'}, { 'library': 'com.github.bumptech.glide:glide', 'version': '3.6.0'}, { 'libray': 'com.caverock:androidsvg', 'version': '1.2.1'}, { 'library': 'com.github.Raizlabs.DBFlow:dbflow-processor', 'version': '3.0.1'}, { 'library': 'com.github.Raizlabs.DBFlow:dbflow-core', 'version': '3.0.1'}, { 'library': 'com.github.Raizlabs.DBFlow:dbflow', 'version': '3.0.1'}, { 'library': 'com.facebook.stetho:stetho', 'version': '1.3.1'}, { 'library': 'com.facebook.stetho:stetho-okhttp', 'version': '3: 1.3.1'}, { 'library': 'com.github.chrisbanes:PhotoView', 'version': '1.2.6'}, { 'library': 'com.androidsupport:multidex','version': '1.0.0'}, {'library': 'com.google.code.gson:gson','version': '2.7'}, {'library': 'com.squareup.retrofit2:converter-gson','version': '2.0.2'}, {'library':
'com.anton46:stepsview','version': '0.0.2'}]";
+ private static String licence_json = "[{'library': 'dropbox-android-sdk','version': '1.6.3', 'licence': 'MIT'}, {'library': 'json_simple','version': '1.1','licence': 'Apache 2'}, {'libary': 'sjxp','version': '2.2', 'licence': 'Apache 2'}, {'library': 'com.android.support:appcompat','version': 'v7:23.3.0', 'licence': 'Apache 2'}, {'library': 'com.android.support:cardview','version': 'v7:23.3.0', 'licence': 'Apache 2'}, {'library': 'com.android.support:recyclerview','version': 'v7:23.3.0', 'licence': 'Apache 2'}, {'library': 'com.android.support:support','version': 'v4:23.3.0', 'licence': 'Apache 2'}, {'library': 'com.android.support:design','version': ':23.3.0', 'licence': 'Apache 2'}, {'library': 'com.squareup.retrofit2:retrofit','version': '2.0.2', 'licence': 'Apache 2'}, {'library': 'com.squareup.retrofit2:adapter-rxjava', 'version': '2.0.2', 'licence': 'Apache 2'}, { 'library': 'com.squareup.okhttp3:logging-interceptor', 'version': '3.2.0', 'licence': 'Apache 2'}, { 'library'
: 'com.squareup.retrofit2:converter-simplexml', 'version': '2.0.2', 'licence': 'Apache 2'}, { 'library': 'com.jakewharton:butterknife', 'version': '8.0.1', 'licence': 'Apache 2'}, { 'library': 'com.jakewharton:butterknife-compiler', 'version': '8.0.1', 'licence': 'Apache 2'}, {'library': 'io.reactivex:rxandroid', 'version': '1.2.0', 'licence': 'Apache 2'}, {'library': 'io.reactivex:rxjava', 'version': '1.1.4', 'licence': 'Apache 2'}, {'library': 'org.simpleframework:simple-xml', 'version': '2.7. +', 'licence': 'Apache 2'}, { 'library': 'com.github.bumptech.glide:glide', 'version': '3.6.0', 'licence': 'BSD, MIT & Apache 2'}, { 'library': 'com.caverock:androidsvg', 'version': '1.2.1', 'licence': 'Apache 2'}, { 'library': 'com.github.Raizlabs.DBFlow:dbflow-processor', 'version': '3.0.1', 'licence': 'MIT'}, { 'library': 'com.github.Raizlabs.DBFlow:dbflow-core', 'version': '3.0.1', 'licence': 'MIT'}, { 'library': 'com.github.Raizlabs.DBFlow:dbflow', 'version': '3.0.1', 'licence': 'MIT
'}, { 'library': 'com.facebook.stetho:stetho', 'version': '1.3.1', 'licence': 'BSD'}, { 'library': 'com.facebook.stetho:stetho-okhttp', 'version': '3: 1.3.1', 'licence': 'BSD'}, { 'library': 'com.github.chrisbanes:PhotoView', 'version': '1.2.6', 'licence': 'Apache 2'}, { 'library': 'com.androidsupport:multidex','version': '1.0.0', 'licence': 'Apache 2'}, {'library': 'com.google.code.gson:gson','version': '2.7', 'licence': 'Apache 2'}, {'library': 'com.squareup.retrofit2:converter-gson','version': '2.0.2', 'licence': 'Apache 2'}, {'library': 'com.anton46:stepsview','version': '0.0.2', 'licence': 'Apache 2'}]";
static {
JSONArray licenceList = null;
@@ -32,7 +32,8 @@ public class LicenceContent {
JSONObject libraryDetails = licenceList.getJSONObject(i);
String libraryName = libraryDetails.getString("library");
String libraryVersion = libraryDetails.getString("version");
- addItem(createLicenceItem(i, libraryName, libraryVersion, ""));
+ String licenceVersion = libraryDetails.getString("licence");
+ addItem(createLicenceItem(i, libraryName, libraryVersion, licenceVersion));
} catch (JSONException e) {
e.printStackTrace();
}