From dfc55918003d8c97fbdeeb3ad01429c086aaae29 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Wed, 5 Apr 2017 11:53:00 +0800 Subject: [PATCH] removed core module --- java/advanced/build.gradle | 2 +- java/android/build.gradle | 10 +--------- java/{common => core}/.gitignore | 0 java/{common => core}/build.gradle | 0 .../src/io/nayuki/qrcodegen/BitBuffer.java | 0 .../src/io/nayuki/qrcodegen/QrCode.java | 0 .../src/io/nayuki/qrcodegen/QrSegment.java | 0 java/demo/build.gradle | 2 +- java/javase/build.gradle | 2 +- java/settings.gradle | 2 +- java/svg/build.gradle | 2 +- 11 files changed, 6 insertions(+), 14 deletions(-) rename java/{common => core}/.gitignore (100%) rename java/{common => core}/build.gradle (100%) rename java/{common => core}/src/io/nayuki/qrcodegen/BitBuffer.java (100%) rename java/{common => core}/src/io/nayuki/qrcodegen/QrCode.java (100%) rename java/{common => core}/src/io/nayuki/qrcodegen/QrSegment.java (100%) diff --git a/java/advanced/build.gradle b/java/advanced/build.gradle index 52f6b41..c0612d3 100644 --- a/java/advanced/build.gradle +++ b/java/advanced/build.gradle @@ -1,3 +1,3 @@ dependencies { - compile project(':common') + compile project(':core') } \ No newline at end of file diff --git a/java/android/build.gradle b/java/android/build.gradle index e357a96..535a8da 100644 --- a/java/android/build.gradle +++ b/java/android/build.gradle @@ -1,11 +1,3 @@ -sourceSets { - main { - java { - srcDirs = ['src'] - } - } -} - configurations { providedCompile } sourceSets.main.compileClasspath += configurations.providedCompile @@ -13,6 +5,6 @@ sourceSets.test.compileClasspath += configurations.providedCompile sourceSets.test.runtimeClasspath += configurations.providedCompile dependencies { - compile project(':common') + compile project(':core') providedCompile 'com.google.android:android:4.1.1.4' } \ No newline at end of file diff --git a/java/common/.gitignore b/java/core/.gitignore similarity index 100% rename from java/common/.gitignore rename to java/core/.gitignore diff --git a/java/common/build.gradle b/java/core/build.gradle similarity index 100% rename from java/common/build.gradle rename to java/core/build.gradle diff --git a/java/common/src/io/nayuki/qrcodegen/BitBuffer.java b/java/core/src/io/nayuki/qrcodegen/BitBuffer.java similarity index 100% rename from java/common/src/io/nayuki/qrcodegen/BitBuffer.java rename to java/core/src/io/nayuki/qrcodegen/BitBuffer.java diff --git a/java/common/src/io/nayuki/qrcodegen/QrCode.java b/java/core/src/io/nayuki/qrcodegen/QrCode.java similarity index 100% rename from java/common/src/io/nayuki/qrcodegen/QrCode.java rename to java/core/src/io/nayuki/qrcodegen/QrCode.java diff --git a/java/common/src/io/nayuki/qrcodegen/QrSegment.java b/java/core/src/io/nayuki/qrcodegen/QrSegment.java similarity index 100% rename from java/common/src/io/nayuki/qrcodegen/QrSegment.java rename to java/core/src/io/nayuki/qrcodegen/QrSegment.java diff --git a/java/demo/build.gradle b/java/demo/build.gradle index f98880e..e2f0d2f 100644 --- a/java/demo/build.gradle +++ b/java/demo/build.gradle @@ -1,4 +1,4 @@ dependencies { - compile project(':common') + compile project(':core') compile project(':javase') } \ No newline at end of file diff --git a/java/javase/build.gradle b/java/javase/build.gradle index 52f6b41..c0612d3 100644 --- a/java/javase/build.gradle +++ b/java/javase/build.gradle @@ -1,3 +1,3 @@ dependencies { - compile project(':common') + compile project(':core') } \ No newline at end of file diff --git a/java/settings.gradle b/java/settings.gradle index 53b40c3..daaf440 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -1,4 +1,4 @@ -include ':common' +include ':core' include ':advanced' include ':javase' include ':android' diff --git a/java/svg/build.gradle b/java/svg/build.gradle index 52f6b41..c0612d3 100644 --- a/java/svg/build.gradle +++ b/java/svg/build.gradle @@ -1,3 +1,3 @@ dependencies { - compile project(':common') + compile project(':core') } \ No newline at end of file