From 3c897d68ff75fac4a351154ca903a1d8791604c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 31 Jan 2014 14:08:38 +0100 Subject: Change gradle build for spongy castle, now Android Studio properly finds the classes --- build.gradle | 2 - libraries/spongycastle/core/build.gradle | 12 ++++++ libraries/spongycastle/pg/build.gradle | 14 +++++++ libraries/spongycastle/pkix/build.gradle | 14 +++++++ libraries/spongycastle/prov/build.gradle | 13 +++++++ spongycastle.gradle | 67 -------------------------------- 6 files changed, 53 insertions(+), 69 deletions(-) create mode 100644 libraries/spongycastle/core/build.gradle create mode 100644 libraries/spongycastle/pg/build.gradle create mode 100644 libraries/spongycastle/pkix/build.gradle create mode 100644 libraries/spongycastle/prov/build.gradle delete mode 100644 spongycastle.gradle diff --git a/build.gradle b/build.gradle index 06ffe7af0..c5ca596fc 100644 --- a/build.gradle +++ b/build.gradle @@ -17,5 +17,3 @@ allprojects { task wrapper(type: Wrapper) { gradleVersion = '1.10' } - -apply from: 'spongycastle.gradle' diff --git a/libraries/spongycastle/core/build.gradle b/libraries/spongycastle/core/build.gradle new file mode 100644 index 000000000..e8e5678cf --- /dev/null +++ b/libraries/spongycastle/core/build.gradle @@ -0,0 +1,12 @@ +apply plugin: 'java' + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.11' +} + +sourceCompatibility = 1.5 +targetCompatibility = 1.5 +version = '1.50.0.0' + +// skip tests +build.dependsOn.remove("check") \ No newline at end of file diff --git a/libraries/spongycastle/pg/build.gradle b/libraries/spongycastle/pg/build.gradle new file mode 100644 index 000000000..83f7c34d4 --- /dev/null +++ b/libraries/spongycastle/pg/build.gradle @@ -0,0 +1,14 @@ +apply plugin: 'java' + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.11' + compile project(':libraries:spongycastle:core') + compile project(':libraries:spongycastle:prov') +} + +sourceCompatibility = 1.5 +targetCompatibility = 1.5 +version = '1.50.0.0' + +// skip tests +build.dependsOn.remove("check") \ No newline at end of file diff --git a/libraries/spongycastle/pkix/build.gradle b/libraries/spongycastle/pkix/build.gradle new file mode 100644 index 000000000..83f7c34d4 --- /dev/null +++ b/libraries/spongycastle/pkix/build.gradle @@ -0,0 +1,14 @@ +apply plugin: 'java' + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.11' + compile project(':libraries:spongycastle:core') + compile project(':libraries:spongycastle:prov') +} + +sourceCompatibility = 1.5 +targetCompatibility = 1.5 +version = '1.50.0.0' + +// skip tests +build.dependsOn.remove("check") \ No newline at end of file diff --git a/libraries/spongycastle/prov/build.gradle b/libraries/spongycastle/prov/build.gradle new file mode 100644 index 000000000..87394b68d --- /dev/null +++ b/libraries/spongycastle/prov/build.gradle @@ -0,0 +1,13 @@ +apply plugin: 'java' + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.11' + compile project(':libraries:spongycastle:core') +} + +sourceCompatibility = 1.5 +targetCompatibility = 1.5 +version = '1.50.0.0' + +// skip tests +build.dependsOn.remove("check") \ No newline at end of file diff --git a/spongycastle.gradle b/spongycastle.gradle deleted file mode 100644 index 4665f6b3e..000000000 --- a/spongycastle.gradle +++ /dev/null @@ -1,67 +0,0 @@ - -project(':libraries:spongycastle:core') { - apply plugin: 'java' - - dependencies { - testCompile group: 'junit', name: 'junit', version: '4.11' - } - - sourceCompatibility = 1.5 - targetCompatibility = 1.5 - version = '1.50.0.0' - - // skip tests - build.dependsOn.remove("check") -} - -project(':libraries:spongycastle:pg') { - apply plugin: 'java' - - dependencies { - testCompile group: 'junit', name: 'junit', version: '4.11' - compile project(':libraries:spongycastle:core') - compile project(':libraries:spongycastle:prov') - } - - sourceCompatibility = 1.5 - targetCompatibility = 1.5 - version = '1.50.0.0' - - // skip tests - build.dependsOn.remove("check") -} - -project(':libraries:spongycastle:pkix') { - apply plugin: 'java' - - dependencies { - testCompile group: 'junit', name: 'junit', version: '4.11' - compile project(':libraries:spongycastle:core') - compile project(':libraries:spongycastle:prov') - } - - sourceCompatibility = 1.5 - targetCompatibility = 1.5 - version = '1.50.0.0' - - // skip tests - build.dependsOn.remove("check") -} - -project(':libraries:spongycastle:prov') { - apply plugin: 'java' - - dependencies { - testCompile group: 'junit', name: 'junit', version: '4.11' - compile project(':libraries:spongycastle:core') - } - - sourceCompatibility = 1.5 - targetCompatibility = 1.5 - version = '1.50.0.0' - - // skip tests - build.dependsOn.remove("check") -} - - -- cgit v1.2.3