skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Adjust gradle build configuration to new project structure.

Browse Source
This commit is contained in:
Maarten Billemont
2017-03-06 14:52:52 -05:00
parent c6b285a9c0
commit 10cfe95158
6 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
build/settings.gradle
View File

@@ -1,7 +1,19 @@
rootProject.name = 'masterpassword' rootProject.name = ':masterpassword'
include ':masterpassword-tests'
include ':masterpassword-algorithm' include ':masterpassword:algorithm'
include ':masterpassword-model' project(':masterpassword:algorithm').projectDir = new File( '../core/java/algorithm' )
include ':masterpassword-cli'
include ':masterpassword-gui' include ':masterpassword:model'
include ':masterpassword-android' project(':masterpassword:model').projectDir = new File( '../core/java/model' )
include ':masterpassword:tests'
project(':masterpassword:tests').projectDir = new File( '../core/java/tests' )
include ':masterpassword:android'
project(':masterpassword:android').projectDir = new File( '../platform-android' )
include ':masterpassword:cli'
project(':masterpassword:cli').projectDir = new File( '../platform-independent/cli-java' )
include ':masterpassword:gui'
project(':masterpassword:gui').projectDir = new File( '../platform-independent/gui-java' )

2
core/java/model/build.gradle
View File

@@ -6,7 +6,7 @@ plugins {
description = 'Master Password Site Model' description = 'Master Password Site Model'
dependencies { dependencies {
compile project(':masterpassword-algorithm') compile project(':masterpassword:algorithm')
compile group: 'joda-time', name: 'joda-time', version:'2.4' compile group: 'joda-time', name: 'joda-time', version:'2.4'

2
core/java/tests/build.gradle
View File

@@ -3,7 +3,7 @@ apply plugin: 'java'
description = 'Master Password Test Suite' description = 'Master Password Test Suite'
dependencies { dependencies {
compile project(':masterpassword-algorithm') compile project(':masterpassword:algorithm')
testCompile group: 'org.testng', name: 'testng', version:'6.8.5' testCompile group: 'org.testng', name: 'testng', version:'6.8.5'
testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2' testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'

7
platform-android/build.gradle
View File

@@ -27,14 +27,15 @@ android {
} }
buildTypes { buildTypes {
release { release {
signingConfig signingConfigs.release if (System.getenv('STORE_PW') != null)
signingConfig signingConfigs.release
} }
} }
} }
dependencies { dependencies {
compile project( ':masterpassword-algorithm' ) compile project( ':masterpassword:algorithm' )
compile project( ':masterpassword-tests' ) compile project( ':masterpassword:tests' )
// Android dependencies // Android dependencies
compile 'org.slf4j:slf4j-android:1.7.13-underscore' compile 'org.slf4j:slf4j-android:1.7.13-underscore'

2
platform-independent/cli-java/build.gradle
View File

@@ -8,7 +8,7 @@ description = 'Master Password CLI'
mainClassName = 'com.lyndir.masterpassword.CLI' mainClassName = 'com.lyndir.masterpassword.CLI'
dependencies { dependencies {
compile project(':masterpassword-algorithm') compile project(':masterpassword:algorithm')
compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2' compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
} }

2
platform-independent/gui-java/build.gradle
View File

@@ -8,7 +8,7 @@ description = 'Master Password GUI'
mainClassName = 'com.lyndir.masterpassword.gui.GUI' mainClassName = 'com.lyndir.masterpassword.gui.GUI'
dependencies { dependencies {
compile project(':masterpassword-model') compile project(':masterpassword:model')
compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2' compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
compile group: 'com.yuvimasory', name: 'orange-extensions', version:'1.3.0' compile group: 'com.yuvimasory', name: 'orange-extensions', version:'1.3.0'