diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /libs/minidns/build.gradle | |
parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to '')
-rw-r--r-- | libs/minidns/build.gradle | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/libs/minidns/build.gradle b/libs/minidns/build.gradle deleted file mode 100644 index c9b93467..00000000 --- a/libs/minidns/build.gradle +++ /dev/null @@ -1,80 +0,0 @@ -apply plugin: 'java' -apply plugin: 'eclipse' -apply plugin: 'osgi' -apply plugin: 'nexus' - -buildscript { - repositories { - jcenter() - mavenLocal() - mavenCentral() - } - - dependencies { - classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7.1' - } -} - -group = 'de.measite.minidns' -description = "A minimal DNS client library with support for A, AAAA, NS and SRV records" -sourceCompatibility = 1.7 -version = 'git tag --points-at HEAD'.execute().text.trim() - -ext { - isSNAPSHOT = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() == 'master' -} - -if (isSNAPSHOT) { - version = version + '-SNAPSHOT' -} - -repositories { - mavenLocal() - mavenCentral() -} - -nexus { - attachSources = true - attachTests = false - attachJavadoc = true - sign = true -} - -modifyPom { - project { - name 'minidns' - description 'Minimal DNS library for java and android systems' - url 'https://github.com/rtreffer/minidns' - inceptionYear '2014' - - scm { - url 'https://github.com/rtreffer/minidns' - connection 'scm:https://github.com/rtreffer/minidns' - developerConnection 'scm:git://github.com/rtreffer/minidns.git' - } - - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - - developers { - developer { - id 'rtreffer' - name 'Rene Treffer' - email 'treffer@measite.de' - } - developer { - id 'flow' - name 'Florian Schmaus' - email 'flow@geekplace.eu' - } - } - } -} - -dependencies { -} |