From a34ca0f6fcaac308b9612fe5eef97b148332a941 Mon Sep 17 00:00:00 2001 From: Jo Grimstad Date: Thu, 28 Dec 2017 14:30:54 +0300 Subject: [PATCH 1/4] #432 Switch from Archiva to Bintray - Updated Maven URL in README file --- contentprovider/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contentprovider/README.md b/contentprovider/README.md index 59fa27c..f494ad1 100644 --- a/contentprovider/README.md +++ b/contentprovider/README.md @@ -6,7 +6,7 @@ To import the library, you first need to add our repository in app/build.gradle: repositories { mavenLocal() maven { - url "http://archiva.educativo.eu:8081/repository/internal/" + url "https://dl.bintray.com/elimu-ai/maven/" } } ``` @@ -17,7 +17,7 @@ Then, add the following dependencies: dependencies { ... - compile 'org.literacyapp:literacyapp-model:1.1.56' + compile 'org.literacyapp:literacyapp-model:1.1.67' compile 'org.literacyapp:contentprovider:1.1.1' compile 'org.greenrobot:greendao:3.2.0' } From 198a992a4e75e16623e0713d50ef82f347a64f52 Mon Sep 17 00:00:00 2001 From: Jo Grimstad Date: Thu, 28 Dec 2017 14:37:13 +0300 Subject: [PATCH 2/4] #432 Switch from Archiva to Bintray --- build.gradle | 2 +- contentprovider/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e9097ea..c7d12dd 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ allprojects { jcenter() mavenCentral() maven { - url "http://archiva.educativo.eu:8081/repository/internal/" + url "https://dl.bintray.com/elimu-ai/maven/" } } } diff --git a/contentprovider/build.gradle b/contentprovider/build.gradle index 5693802..c40c7db 100644 --- a/contentprovider/build.gradle +++ b/contentprovider/build.gradle @@ -49,7 +49,7 @@ dependencies { }) testCompile 'junit:junit:4.12' - compile 'org.literacyapp:literacyapp-model:1.1.56' + compile 'org.literacyapp:literacyapp-model:1.1.67' compile 'org.greenrobot:greendao:3.2.0' compile 'com.android.support:appcompat-v7:23.4.0' } From 5434085c6797c383519b7a345d7c6169d0a1b960 Mon Sep 17 00:00:00 2001 From: Jo Grimstad Date: Thu, 28 Dec 2017 18:35:58 +0300 Subject: [PATCH 3/4] #432 Switch from Archiva to Bintray - Added Maven repo URL for face recognition library --- app/build.gradle | 2 +- build.gradle | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0b01341..fa3cc6c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -96,7 +96,7 @@ dependencies { compile 'org.greenrobot:greendao:3.2.0' compile project(':openCVLibrary310') - compile 'ch.zhaw:facerecognitionlibrary:1.4.0' + compile 'ch.zhaw:facerecognitionlibrary:1.5.4' compile 'org.literacyapp.analytics:eventtracker:1.0.2' diff --git a/build.gradle b/build.gradle index c7d12dd..f1810ca 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,9 @@ allprojects { maven { url "https://dl.bintray.com/elimu-ai/maven/" } + maven { + url "https://dl.bintray.com/qualeams/Android-Face-Recognition-Deep-Learning-Library/" + } } } From 80137abe86b2af143f02fdfc0109229728164009 Mon Sep 17 00:00:00 2001 From: Jo Grimstad Date: Thu, 28 Dec 2017 18:40:01 +0300 Subject: [PATCH 4/4] #432 Switch from Archiva to Bintray - Fixed wrong library name --- contentprovider/README.md | 2 +- contentprovider/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contentprovider/README.md b/contentprovider/README.md index f494ad1..4f2facc 100644 --- a/contentprovider/README.md +++ b/contentprovider/README.md @@ -17,7 +17,7 @@ Then, add the following dependencies: dependencies { ... - compile 'org.literacyapp:literacyapp-model:1.1.67' + compile 'ai.elimu:model:1.1.67' compile 'org.literacyapp:contentprovider:1.1.1' compile 'org.greenrobot:greendao:3.2.0' } diff --git a/contentprovider/build.gradle b/contentprovider/build.gradle index c40c7db..1f72052 100644 --- a/contentprovider/build.gradle +++ b/contentprovider/build.gradle @@ -49,7 +49,7 @@ dependencies { }) testCompile 'junit:junit:4.12' - compile 'org.literacyapp:literacyapp-model:1.1.67' + compile 'ai.elimu:model:1.1.67' compile 'org.greenrobot:greendao:3.2.0' compile 'com.android.support:appcompat-v7:23.4.0' }