Merge pull request #33 from zeoflow/maven-deploy-bug-fix

Maven deploy bug fixed
zeoflow · Apr 11, 2021 · cec977d · cec977d
2 parents 34180d8 + bf1f6cd
commit cec977d
Show file tree

Hide file tree

Showing 30 changed files with 15 additions and 12 deletions.
diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore
@@ -1,2 +1,5 @@
 # SIGNING KEYS
-*.gpg
+*.gpg
+
+# Key Credentials
+gradle.properties
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation("com.zeoflow:parcelled-runtime:1.1.0")
     annotationProcessor("com.zeoflow:parcelled-compiler:1.1.0")
 
-    implementation project(":memo:memo")
-    implementation project(":memo:annotation")
-    annotationProcessor project(":memo:compiler")
+    implementation project(":memo")
+    implementation project(":memo-annotation")
+    annotationProcessor project(":memo-compiler")
 }
diff --git a/gradle.properties b/gradle.properties
@@ -30,7 +30,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
 # Maven
 POM_NAME=Memo
 POM_PACKAGING=aar
-VERSION_NAME=1.1.1
+VERSION_NAME=1.1.2
 GROUP=com.zeoflow
 POM_DESCRIPTION=Android processing and secured library for managing SharedPreferences as key-value elements efficiently and structurally.
 POM_URL=https://github.com/zeoflow/memo
@@ -42,4 +42,4 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=zeoflow
 POM_DEVELOPER_NAME=ZeoFlow
-org.gradle.daemon=true
+org.gradle.daemon=true
diff --git a/memo-annotation/build.gradle b/memo-annotation/build.gradle
@@ -19,7 +19,7 @@ android {
 
 dependencies {
     api "androidx.annotation:annotation:1.2.0"
-    implementation project(":memo:memo")
+    implementation project(":memo")
 }
 
 apply from: "${rootProject.projectDir}/buildSrc/upload.gradle"
diff --git a/memo-compiler/build.gradle b/memo-compiler/build.gradle
@@ -20,8 +20,8 @@ android {
 }
 
 dependencies {
-    implementation project(":memo:memo")
-    implementation project(":memo:annotation")
+    implementation project(":memo")
+    implementation project(":memo-annotation")
 
     implementation("com.zeoflow:jx:1.2.0")
 

diff --git a/memo-core/.gitignore → memo/.gitignore b/memo-core/.gitignore → memo/.gitignore
diff --git a/memo-core/build.gradle → memo/build.gradle b/memo-core/build.gradle → memo/build.gradle
diff --git a/memo-core/gradle.properties → memo/gradle.properties b/memo-core/gradle.properties → memo/gradle.properties
diff --git a/memo-core/src/main/AndroidManifest.xml → memo/src/main/AndroidManifest.xml b/memo-core/src/main/AndroidManifest.xml → memo/src/main/AndroidManifest.xml
diff --git a/...a/com/zeoflow/memo/ConcealEncryption.java → ...a/com/zeoflow/memo/ConcealEncryption.java b/...a/com/zeoflow/memo/ConcealEncryption.java → ...a/com/zeoflow/memo/ConcealEncryption.java
diff --git a/...main/java/com/zeoflow/memo/Converter.java → ...main/java/com/zeoflow/memo/Converter.java b/...main/java/com/zeoflow/memo/Converter.java → ...main/java/com/zeoflow/memo/Converter.java
diff --git a/.../main/java/com/zeoflow/memo/DataInfo.java → .../main/java/com/zeoflow/memo/DataInfo.java b/.../main/java/com/zeoflow/memo/DataInfo.java → .../main/java/com/zeoflow/memo/DataInfo.java
diff --git a/...a/com/zeoflow/memo/DefaultMemoFacade.java → ...a/com/zeoflow/memo/DefaultMemoFacade.java b/...a/com/zeoflow/memo/DefaultMemoFacade.java → ...a/com/zeoflow/memo/DefaultMemoFacade.java
diff --git a/...ain/java/com/zeoflow/memo/Encryption.java → ...ain/java/com/zeoflow/memo/Encryption.java b/...ain/java/com/zeoflow/memo/Encryption.java → ...ain/java/com/zeoflow/memo/Encryption.java
diff --git a/...n/java/com/zeoflow/memo/InitProvider.java → ...n/java/com/zeoflow/memo/InitProvider.java b/...n/java/com/zeoflow/memo/InitProvider.java → ...n/java/com/zeoflow/memo/InitProvider.java
diff --git a/...java/com/zeoflow/memo/LogInterceptor.java → ...java/com/zeoflow/memo/LogInterceptor.java b/...java/com/zeoflow/memo/LogInterceptor.java → ...java/com/zeoflow/memo/LogInterceptor.java
diff --git a/.../src/main/java/com/zeoflow/memo/Memo.java → .../src/main/java/com/zeoflow/memo/Memo.java b/.../src/main/java/com/zeoflow/memo/Memo.java → .../src/main/java/com/zeoflow/memo/Memo.java
diff --git a/...ava/com/zeoflow/memo/MemoApplication.java → ...ava/com/zeoflow/memo/MemoApplication.java b/...ava/com/zeoflow/memo/MemoApplication.java → ...ava/com/zeoflow/memo/MemoApplication.java
diff --git a/...in/java/com/zeoflow/memo/MemoBuilder.java → ...in/java/com/zeoflow/memo/MemoBuilder.java b/...in/java/com/zeoflow/memo/MemoBuilder.java → ...in/java/com/zeoflow/memo/MemoBuilder.java
diff --git a/.../java/com/zeoflow/memo/MemoConverter.java → .../java/com/zeoflow/memo/MemoConverter.java b/.../java/com/zeoflow/memo/MemoConverter.java → .../java/com/zeoflow/memo/MemoConverter.java
diff --git a/...ain/java/com/zeoflow/memo/MemoFacade.java → ...ain/java/com/zeoflow/memo/MemoFacade.java b/...ain/java/com/zeoflow/memo/MemoFacade.java → ...ain/java/com/zeoflow/memo/MemoFacade.java
diff --git a/...java/com/zeoflow/memo/MemoSerializer.java → ...java/com/zeoflow/memo/MemoSerializer.java b/...java/com/zeoflow/memo/MemoSerializer.java → ...java/com/zeoflow/memo/MemoSerializer.java
diff --git a/...main/java/com/zeoflow/memo/MemoUtils.java → ...main/java/com/zeoflow/memo/MemoUtils.java b/...main/java/com/zeoflow/memo/MemoUtils.java → ...main/java/com/zeoflow/memo/MemoUtils.java
diff --git a/...n/java/com/zeoflow/memo/NoEncryption.java → ...n/java/com/zeoflow/memo/NoEncryption.java b/...n/java/com/zeoflow/memo/NoEncryption.java → ...n/java/com/zeoflow/memo/NoEncryption.java
diff --git a/...rc/main/java/com/zeoflow/memo/Parser.java → ...rc/main/java/com/zeoflow/memo/Parser.java b/...rc/main/java/com/zeoflow/memo/Parser.java → ...rc/main/java/com/zeoflow/memo/Parser.java
diff --git a/...ain/java/com/zeoflow/memo/Serializer.java → ...ain/java/com/zeoflow/memo/Serializer.java b/...ain/java/com/zeoflow/memo/Serializer.java → ...ain/java/com/zeoflow/memo/Serializer.java
diff --git a/...eoflow/memo/SharedPreferencesStorage.java → ...eoflow/memo/SharedPreferencesStorage.java b/...eoflow/memo/SharedPreferencesStorage.java → ...eoflow/memo/SharedPreferencesStorage.java
diff --git a/...c/main/java/com/zeoflow/memo/Storage.java → ...c/main/java/com/zeoflow/memo/Storage.java b/...c/main/java/com/zeoflow/memo/Storage.java → ...c/main/java/com/zeoflow/memo/Storage.java
diff --git a/...ain/java/com/zeoflow/memo/ZsonParser.java → ...ain/java/com/zeoflow/memo/ZsonParser.java b/...ain/java/com/zeoflow/memo/ZsonParser.java → ...ain/java/com/zeoflow/memo/ZsonParser.java
diff --git a/settings.gradle b/settings.gradle
@@ -107,8 +107,8 @@ def includeProject(name, filePath, List<BuildType> filter = []) {
 includeProject(":demo", "demo")
 
 // Memo Components
-includeProject(":memo:memo", "memo-core")
-includeProject(":memo:annotation", "memo-annotation")
-includeProject(":memo:compiler", "memo-compiler")
+includeProject(":memo", "memo")
+includeProject(":memo-annotation", "memo-annotation")
+includeProject(":memo-compiler", "memo-compiler")
 
 rootProject.name = "Memo"