diff --git a/app/build.gradle b/app/build.gradle index 07a4e3fdf..09b8a5f96 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -49,6 +49,10 @@ dependencies { compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.7' compile 'com.fasterxml.jackson.core:jackson-databind:2.8.7' + compile 'com.madgag.spongycastle:pkix:1.54.0.0' + compile 'com.madgag.spongycastle:prov:1.54.0.0' + compile 'com.madgag.spongycastle:core:1.54.0.0' + testCompile "org.robolectric:robolectric:3.3.2" testCompile 'junit:junit:4.12' // As per https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474 @@ -60,99 +64,55 @@ dependencies { androidTestCompile 'com.android.support.test:rules:0.5' } -if (!hasProperty('sourceDeps')) { - - dependencies { - compile 'com.madgag.spongycastle:pkix:1.54.0.0' - compile 'com.madgag.spongycastle:prov:1.54.0.0' - compile 'com.madgag.spongycastle:core:1.54.0.0' - - // Upstream doesn't have a binary on mavenCentral, and it is an SVN repo on - // Google Code. We include this code directly in this repo, and have made - // modifications that should be pushed to anyone who wants to maintain it. - compile files('libs/binaryDeps/zipsigner.jar') - } - - // Only do the libraries imported from maven repositories. Our own libraries - // (like privileged-api-lib) and the prebuilt jars already checked into the - // source code don't need to be here. - // generate using: `gradle -q calculateChecksums | sort -V` - dependencyVerification { - verify = [ - 'android.arch.core:common:d34824b794bc92ff8f647a9bb13a7c73de920de5b47075b5d2c4f0770e9b8bfd', - 'android.arch.core:runtime:83400f7575bcfb8a2eeec64e05590f037bfaed1e56aa3a4214d20e55878445e3', - 'android.arch.lifecycle:common:614e31cfd33255dc4d5f5d8e62cfa6be2fbbc2a35643a79dc3ed008004c30807', - 'android.arch.lifecycle:livedata-core:14e57ff8ffb65a80c7e72d91f2076acccdaf2970f234c6261e03a6127eb5206b', - 'android.arch.lifecycle:runtime:094fd793924dd6a5136753e599ac8174a8147f4a401386b694ba7d818c223e2e', - 'android.arch.lifecycle:viewmodel:6407c93a5ea9850661dca42a0068d6f3deccefd7228ee69bae1c35d70cbc2557', - 'cc.mvdan.accesspoint:library:0837b38adb48b66bb1385adb6ade8ecce7002ad815c55abf13517c82193458ea', - 'ch.acra:acra:d2762968c448757a7d6acc9f141881d9632f664988e9723ece33b5f7c79f3bc9', - 'commons-io:commons-io:a10418348d234968600ccb1d988efcbbd08716e1d96936ccc1880e7d22513474', - 'commons-net:commons-net:c25b0da668b3c5649f002d504def22d1b4cb30d206f05428d2fe168fa1a901c2', - 'com.android.support.constraint:constraint-layout-solver:fcb4c7d705754ca3d69b1b2c3caf445a425599fda8caabbcf855d98ea0663e4e', - 'com.android.support.constraint:constraint-layout:d490188709b7bb2f11609beadd7e5eb7538892f308828ec3ff261a74e6ecf47e', - 'com.android.support:animated-vector-drawable:59670473f6e98fda792f7bef25dd7292b0a3106031c7a5e30eb020bf26f077bd', - 'com.android.support:appcompat-v7:0c7808fbbc5838d831e32e3c0a6f84e1f2c981deb8f11e010650f2b57923a335', - 'com.android.support:cardview-v7:8ed955dd037d82a7b4bbcaedb4f896523c3e4c1bf3ca698ce807c350767a2886', - 'com.android.support:design:7225973f7ee03765008a9c2f17a40b154c6885169fef022276e811c926a2202c', - 'com.android.support:gridlayout-v7:2f5af33c4be1d3e4e3fa999323265718ac1a4c81df4c0373d6ce8901613b1671', - 'com.android.support:palette-v7:6d24037fb375c7884f878edeb88c812b87a05c69221513507ecea21c257d6314', - 'com.android.support:recyclerview-v7:d735e4727878e99ef3980c10d15dc3468462fd509d4fb60cb8bd20b0f735085c', - 'com.android.support:support-annotations:3365960206c3d2b09e845f555e7f88f8effc8d2f00b369e66c4be384029299cf', - 'com.android.support:support-compat:880ce01ff5be42b233ff8ec0c61cefb7dc3dc9500fea9e24423214813ac27ea2', - 'com.android.support:support-core-ui:a3ae20e6d5dffba69ac97b99846d2738003af8563843d5f3c9dc4c35b4804241', - 'com.android.support:support-core-utils:61036832c54e8701aae954fc3bf96d1d80bf8d9dd531bff77d72def456ba087a', - 'com.android.support:support-fragment:ec72d6ac36a1a0e6523bbddba33d73ffad070b9b3dd246cc44d8727a41ddb5e6', - 'com.android.support:support-media-compat:55e9837dda88b74a8c812c63a78c63fd83c6c039a8c22d318492663a493585eb', - 'com.android.support:support-v4:4f41dfc3e89f2738e45c86264a85c0934d055ee8ebe2020e23c97f303b80a48b', - 'com.android.support:support-vector-drawable:1c0f421114cf4627cf208776d6eb4f76340c78b7e96fe6e12b3e6eb950caf1b9', - 'com.android.support:transition:c0765b2f3c78696567ec5b3f519d22da1e3df11ac994625adf4bb4dc571caacc', - 'com.fasterxml.jackson.core:jackson-annotations:6b7802f6c22c09c4a92a2ebeb76e755c3c0a58dfbf419835fae470d89e469b86', - 'com.fasterxml.jackson.core:jackson-core:256ff34118ab292d1b4f3ee4d2c3e5e5f0f609d8e07c57e8ad1f51c46d4fbb46', - 'com.fasterxml.jackson.core:jackson-databind:4f74337b6d18664be0f5b15c6664b17aa3972c9c175092328b139b894ff66f19', - 'com.github.pserwylo:BottomNavigation:83d7941a7a8d21ba1a8a708cd683b1bb07c6cf898044dc92eadf18a7a7d54f90', - 'com.google.zxing:core:52dd6211bbaf4e600de693834d597e49707f3e6606e1f5d3740fbb8274466abe', - 'com.hannesdorfmann:adapterdelegates3:1b20d099d6e7afe57aceca13b713b386959d94a247c3c06a7aeb65b866ece02f', - 'com.madgag.spongycastle:core:1e7fa4b19ccccd1011364ab838d0b4702470c178bbbdd94c5c90b2d4d749ea1e', - 'com.madgag.spongycastle:pkix:721a302f5ce18bf6fff89d514ef224c37b5dd9ca67a16b56fafaea4b24a51482', - 'com.madgag.spongycastle:prov:cf89c550fda86c0f26858c3d851ac1d2ce49cd78dd144cd86f307b7ea3e6afd7', - 'com.nostra13.universalimageloader:universal-image-loader:dbd5197ffec3a8317533190870a7c00ff3750dd6a31241448c6a5522d51b65b4', - 'eu.chainfire:libsuperuser:018344ff19ee94d252c14b4a503ee8b519184db473a5af83513f5837c413b128', - 'info.guardianproject.netcipher:netcipher:eeeb5d0d95ccfe176b4296cbd71a9a24c6efb0bab5c4025a8c6bc36abdddfc75', - 'info.guardianproject.panic:panic:a7ed9439826db2e9901649892cf9afbe76f00991b768d8f4c26332d7c9406cb2', - 'io.reactivex:rxandroid:35c1a90f8c1f499db3c1f3d608e1f191ac8afddb10c02dd91ef04c03a0a4bcda', - 'io.reactivex:rxjava:2c162afd78eba217cdfee78b60e85d3bfb667db61e12bc95e3cf2ddc5beeadf6', - 'org.jmdns:jmdns:24e7e3a50a579136400e8c9b0750399eb3c7558918bdf52c0ffa5e0fa5aad503', - 'org.slf4j:slf4j-api:e56288031f5e60652c06e7bb6e9fa410a61231ab54890f7b708fc6adc4107c5b', - ] - } - -} else { - - logger.info "Setting up *source* dependencies for F-Droid (because you passed in the -PsourceDeps argument to gradle while building)." - - dependencies { - compile project(':extern:zipsigner') - } - - task binaryDeps(type: Copy, dependsOn: ':app:prepareReleaseDependencies') { - - enabled = project.hasProperty('sourceDeps') - description = "Copies .jar and .aar files from subproject dependencies in extern/ to app/libs. Requires the sourceDeps property to be set (\"gradle -PsourceDeps binaryDeps\")" - - from('../extern/') { - include 'zipsigner/build/libs/zipsigner.jar' - } - - into 'libs/binaryDeps' - includeEmptyDirs false - - eachFile { FileCopyDetails details -> - // Don't copy to a sub folder such as libs/binaryDeps/Project/build/outputs/aar/project.aar, but - // rather libs/binaryDeps/project.aar. - details.path = details.name - } - } +// generate using: `gradle -q calculateChecksums | sort -V` +dependencyVerification { + verify = [ + 'android.arch.core:common:d34824b794bc92ff8f647a9bb13a7c73de920de5b47075b5d2c4f0770e9b8bfd', + 'android.arch.core:runtime:83400f7575bcfb8a2eeec64e05590f037bfaed1e56aa3a4214d20e55878445e3', + 'android.arch.lifecycle:common:614e31cfd33255dc4d5f5d8e62cfa6be2fbbc2a35643a79dc3ed008004c30807', + 'android.arch.lifecycle:livedata-core:14e57ff8ffb65a80c7e72d91f2076acccdaf2970f234c6261e03a6127eb5206b', + 'android.arch.lifecycle:runtime:094fd793924dd6a5136753e599ac8174a8147f4a401386b694ba7d818c223e2e', + 'android.arch.lifecycle:viewmodel:6407c93a5ea9850661dca42a0068d6f3deccefd7228ee69bae1c35d70cbc2557', + 'cc.mvdan.accesspoint:library:0837b38adb48b66bb1385adb6ade8ecce7002ad815c55abf13517c82193458ea', + 'ch.acra:acra:d2762968c448757a7d6acc9f141881d9632f664988e9723ece33b5f7c79f3bc9', + 'commons-io:commons-io:a10418348d234968600ccb1d988efcbbd08716e1d96936ccc1880e7d22513474', + 'commons-net:commons-net:c25b0da668b3c5649f002d504def22d1b4cb30d206f05428d2fe168fa1a901c2', + 'com.android.support.constraint:constraint-layout-solver:fcb4c7d705754ca3d69b1b2c3caf445a425599fda8caabbcf855d98ea0663e4e', + 'com.android.support.constraint:constraint-layout:d490188709b7bb2f11609beadd7e5eb7538892f308828ec3ff261a74e6ecf47e', + 'com.android.support:animated-vector-drawable:59670473f6e98fda792f7bef25dd7292b0a3106031c7a5e30eb020bf26f077bd', + 'com.android.support:appcompat-v7:0c7808fbbc5838d831e32e3c0a6f84e1f2c981deb8f11e010650f2b57923a335', + 'com.android.support:cardview-v7:8ed955dd037d82a7b4bbcaedb4f896523c3e4c1bf3ca698ce807c350767a2886', + 'com.android.support:design:7225973f7ee03765008a9c2f17a40b154c6885169fef022276e811c926a2202c', + 'com.android.support:gridlayout-v7:2f5af33c4be1d3e4e3fa999323265718ac1a4c81df4c0373d6ce8901613b1671', + 'com.android.support:palette-v7:6d24037fb375c7884f878edeb88c812b87a05c69221513507ecea21c257d6314', + 'com.android.support:recyclerview-v7:d735e4727878e99ef3980c10d15dc3468462fd509d4fb60cb8bd20b0f735085c', + 'com.android.support:support-annotations:3365960206c3d2b09e845f555e7f88f8effc8d2f00b369e66c4be384029299cf', + 'com.android.support:support-compat:880ce01ff5be42b233ff8ec0c61cefb7dc3dc9500fea9e24423214813ac27ea2', + 'com.android.support:support-core-ui:a3ae20e6d5dffba69ac97b99846d2738003af8563843d5f3c9dc4c35b4804241', + 'com.android.support:support-core-utils:61036832c54e8701aae954fc3bf96d1d80bf8d9dd531bff77d72def456ba087a', + 'com.android.support:support-fragment:ec72d6ac36a1a0e6523bbddba33d73ffad070b9b3dd246cc44d8727a41ddb5e6', + 'com.android.support:support-media-compat:55e9837dda88b74a8c812c63a78c63fd83c6c039a8c22d318492663a493585eb', + 'com.android.support:support-v4:4f41dfc3e89f2738e45c86264a85c0934d055ee8ebe2020e23c97f303b80a48b', + 'com.android.support:support-vector-drawable:1c0f421114cf4627cf208776d6eb4f76340c78b7e96fe6e12b3e6eb950caf1b9', + 'com.android.support:transition:c0765b2f3c78696567ec5b3f519d22da1e3df11ac994625adf4bb4dc571caacc', + 'com.fasterxml.jackson.core:jackson-annotations:6b7802f6c22c09c4a92a2ebeb76e755c3c0a58dfbf419835fae470d89e469b86', + 'com.fasterxml.jackson.core:jackson-core:256ff34118ab292d1b4f3ee4d2c3e5e5f0f609d8e07c57e8ad1f51c46d4fbb46', + 'com.fasterxml.jackson.core:jackson-databind:4f74337b6d18664be0f5b15c6664b17aa3972c9c175092328b139b894ff66f19', + 'com.github.pserwylo:BottomNavigation:83d7941a7a8d21ba1a8a708cd683b1bb07c6cf898044dc92eadf18a7a7d54f90', + 'com.google.zxing:core:52dd6211bbaf4e600de693834d597e49707f3e6606e1f5d3740fbb8274466abe', + 'com.hannesdorfmann:adapterdelegates3:1b20d099d6e7afe57aceca13b713b386959d94a247c3c06a7aeb65b866ece02f', + 'com.madgag.spongycastle:core:1e7fa4b19ccccd1011364ab838d0b4702470c178bbbdd94c5c90b2d4d749ea1e', + 'com.madgag.spongycastle:pkix:721a302f5ce18bf6fff89d514ef224c37b5dd9ca67a16b56fafaea4b24a51482', + 'com.madgag.spongycastle:prov:cf89c550fda86c0f26858c3d851ac1d2ce49cd78dd144cd86f307b7ea3e6afd7', + 'com.nostra13.universalimageloader:universal-image-loader:dbd5197ffec3a8317533190870a7c00ff3750dd6a31241448c6a5522d51b65b4', + 'eu.chainfire:libsuperuser:018344ff19ee94d252c14b4a503ee8b519184db473a5af83513f5837c413b128', + 'info.guardianproject.netcipher:netcipher:eeeb5d0d95ccfe176b4296cbd71a9a24c6efb0bab5c4025a8c6bc36abdddfc75', + 'info.guardianproject.panic:panic:a7ed9439826db2e9901649892cf9afbe76f00991b768d8f4c26332d7c9406cb2', + 'io.reactivex:rxandroid:35c1a90f8c1f499db3c1f3d608e1f191ac8afddb10c02dd91ef04c03a0a4bcda', + 'io.reactivex:rxjava:2c162afd78eba217cdfee78b60e85d3bfb667db61e12bc95e3cf2ddc5beeadf6', + 'org.jmdns:jmdns:24e7e3a50a579136400e8c9b0750399eb3c7558918bdf52c0ffa5e0fa5aad503', + 'org.slf4j:slf4j-api:e56288031f5e60652c06e7bb6e9fa410a61231ab54890f7b708fc6adc4107c5b', + ] } def isCi = "true".equals(System.getenv("CI")) diff --git a/app/libs/binaryDeps/zipsigner.jar b/app/libs/binaryDeps/zipsigner.jar deleted file mode 100644 index 1a870774e..000000000 Binary files a/app/libs/binaryDeps/zipsigner.jar and /dev/null differ diff --git a/extern/zipsigner/src/main/java/kellinwood/logging/AbstractLogger.java b/app/src/main/java/kellinwood/logging/AbstractLogger.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/logging/AbstractLogger.java rename to app/src/main/java/kellinwood/logging/AbstractLogger.java diff --git a/extern/zipsigner/src/main/java/kellinwood/logging/ConsoleLoggerFactory.java b/app/src/main/java/kellinwood/logging/ConsoleLoggerFactory.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/logging/ConsoleLoggerFactory.java rename to app/src/main/java/kellinwood/logging/ConsoleLoggerFactory.java diff --git a/extern/zipsigner/src/main/java/kellinwood/logging/LoggerFactory.java b/app/src/main/java/kellinwood/logging/LoggerFactory.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/logging/LoggerFactory.java rename to app/src/main/java/kellinwood/logging/LoggerFactory.java diff --git a/extern/zipsigner/src/main/java/kellinwood/logging/LoggerInterface.java b/app/src/main/java/kellinwood/logging/LoggerInterface.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/logging/LoggerInterface.java rename to app/src/main/java/kellinwood/logging/LoggerInterface.java diff --git a/extern/zipsigner/src/main/java/kellinwood/logging/LoggerManager.java b/app/src/main/java/kellinwood/logging/LoggerManager.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/logging/LoggerManager.java rename to app/src/main/java/kellinwood/logging/LoggerManager.java diff --git a/extern/zipsigner/src/main/java/kellinwood/logging/NullLoggerFactory.java b/app/src/main/java/kellinwood/logging/NullLoggerFactory.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/logging/NullLoggerFactory.java rename to app/src/main/java/kellinwood/logging/NullLoggerFactory.java diff --git a/extern/zipsigner/src/main/java/kellinwood/logging/StreamLogger.java b/app/src/main/java/kellinwood/logging/StreamLogger.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/logging/StreamLogger.java rename to app/src/main/java/kellinwood/logging/StreamLogger.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/AutoKeyException.java b/app/src/main/java/kellinwood/security/zipsigner/AutoKeyException.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/AutoKeyException.java rename to app/src/main/java/kellinwood/security/zipsigner/AutoKeyException.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/Base64.java b/app/src/main/java/kellinwood/security/zipsigner/Base64.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/Base64.java rename to app/src/main/java/kellinwood/security/zipsigner/Base64.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java b/app/src/main/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java rename to app/src/main/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/HexDumpEncoder.java b/app/src/main/java/kellinwood/security/zipsigner/HexDumpEncoder.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/HexDumpEncoder.java rename to app/src/main/java/kellinwood/security/zipsigner/HexDumpEncoder.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/HexEncoder.java b/app/src/main/java/kellinwood/security/zipsigner/HexEncoder.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/HexEncoder.java rename to app/src/main/java/kellinwood/security/zipsigner/HexEncoder.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/KeySet.java b/app/src/main/java/kellinwood/security/zipsigner/KeySet.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/KeySet.java rename to app/src/main/java/kellinwood/security/zipsigner/KeySet.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ProgressEvent.java b/app/src/main/java/kellinwood/security/zipsigner/ProgressEvent.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ProgressEvent.java rename to app/src/main/java/kellinwood/security/zipsigner/ProgressEvent.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ProgressHelper.java b/app/src/main/java/kellinwood/security/zipsigner/ProgressHelper.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ProgressHelper.java rename to app/src/main/java/kellinwood/security/zipsigner/ProgressHelper.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ProgressListener.java b/app/src/main/java/kellinwood/security/zipsigner/ProgressListener.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ProgressListener.java rename to app/src/main/java/kellinwood/security/zipsigner/ProgressListener.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ResourceAdapter.java b/app/src/main/java/kellinwood/security/zipsigner/ResourceAdapter.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ResourceAdapter.java rename to app/src/main/java/kellinwood/security/zipsigner/ResourceAdapter.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ZipSignature.java b/app/src/main/java/kellinwood/security/zipsigner/ZipSignature.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ZipSignature.java rename to app/src/main/java/kellinwood/security/zipsigner/ZipSignature.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ZipSigner.java b/app/src/main/java/kellinwood/security/zipsigner/ZipSigner.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/ZipSigner.java rename to app/src/main/java/kellinwood/security/zipsigner/ZipSigner.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/CertCreator.java b/app/src/main/java/kellinwood/security/zipsigner/optional/CertCreator.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/CertCreator.java rename to app/src/main/java/kellinwood/security/zipsigner/optional/CertCreator.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java b/app/src/main/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java rename to app/src/main/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java b/app/src/main/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java rename to app/src/main/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/Fingerprint.java b/app/src/main/java/kellinwood/security/zipsigner/optional/Fingerprint.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/Fingerprint.java rename to app/src/main/java/kellinwood/security/zipsigner/optional/Fingerprint.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/JKS.java b/app/src/main/java/kellinwood/security/zipsigner/optional/JKS.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/JKS.java rename to app/src/main/java/kellinwood/security/zipsigner/optional/JKS.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/JksKeyStore.java b/app/src/main/java/kellinwood/security/zipsigner/optional/JksKeyStore.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/JksKeyStore.java rename to app/src/main/java/kellinwood/security/zipsigner/optional/JksKeyStore.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java b/app/src/main/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java rename to app/src/main/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java b/app/src/main/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java rename to app/src/main/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java b/app/src/main/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java rename to app/src/main/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java b/app/src/main/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java rename to app/src/main/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java diff --git a/extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java b/app/src/main/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java rename to app/src/main/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java diff --git a/extern/zipsigner/src/main/java/kellinwood/zipio/CentralEnd.java b/app/src/main/java/kellinwood/zipio/CentralEnd.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/zipio/CentralEnd.java rename to app/src/main/java/kellinwood/zipio/CentralEnd.java diff --git a/extern/zipsigner/src/main/java/kellinwood/zipio/ZioEntry.java b/app/src/main/java/kellinwood/zipio/ZioEntry.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/zipio/ZioEntry.java rename to app/src/main/java/kellinwood/zipio/ZioEntry.java diff --git a/extern/zipsigner/src/main/java/kellinwood/zipio/ZioEntryInputStream.java b/app/src/main/java/kellinwood/zipio/ZioEntryInputStream.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/zipio/ZioEntryInputStream.java rename to app/src/main/java/kellinwood/zipio/ZioEntryInputStream.java diff --git a/extern/zipsigner/src/main/java/kellinwood/zipio/ZioEntryOutputStream.java b/app/src/main/java/kellinwood/zipio/ZioEntryOutputStream.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/zipio/ZioEntryOutputStream.java rename to app/src/main/java/kellinwood/zipio/ZioEntryOutputStream.java diff --git a/extern/zipsigner/src/main/java/kellinwood/zipio/ZipInput.java b/app/src/main/java/kellinwood/zipio/ZipInput.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/zipio/ZipInput.java rename to app/src/main/java/kellinwood/zipio/ZipInput.java diff --git a/extern/zipsigner/src/main/java/kellinwood/zipio/ZipListingHelper.java b/app/src/main/java/kellinwood/zipio/ZipListingHelper.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/zipio/ZipListingHelper.java rename to app/src/main/java/kellinwood/zipio/ZipListingHelper.java diff --git a/extern/zipsigner/src/main/java/kellinwood/zipio/ZipOutput.java b/app/src/main/java/kellinwood/zipio/ZipOutput.java similarity index 100% rename from extern/zipsigner/src/main/java/kellinwood/zipio/ZipOutput.java rename to app/src/main/java/kellinwood/zipio/ZipOutput.java