[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 01/02: rename multi-platform submodule
From: |
gnunet |
Subject: |
[taler-taler-android] 01/02: rename multi-platform submodule |
Date: |
Mon, 24 Aug 2020 15:31:52 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit 786f59be0c7791cad37239841b513704f6c2a289
Author: Torsten Grote <t@grobox.de>
AuthorDate: Mon Aug 24 09:22:40 2020 -0300
rename multi-platform submodule
---
.gitmodules | 2 +-
.idea/codeStyles/Project.xml | 11 ++++++++++-
.idea/compiler.xml | 2 --
.idea/gradle.xml | 4 ++--
wallet-kotlin => multiplatform | 0
settings.gradle | 2 +-
taler-kotlin-android/build.gradle | 4 ++--
wallet/build.gradle | 2 +-
8 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 7171b3d..29c8ad2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "wallet-kotlin"]
- path = wallet-kotlin
+ path = multiplatform
url = git://git.taler.net/wallet-kotlin.git
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index dfca6e5..b23c749 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,7 +3,16 @@
<JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value>
- <package name="kotlinx.android.synthetic" withSubpackages="true"
static="false" />
+ <package name="kotlinx.android.synthetic" alias="false"
withSubpackages="true" />
+ </value>
+ </option>
+ <option name="PACKAGES_IMPORT_LAYOUT">
+ <value>
+ <package name="" alias="false" withSubpackages="true" />
+ <package name="java" alias="false" withSubpackages="true" />
+ <package name="javax" alias="false" withSubpackages="true" />
+ <package name="kotlin" alias="false" withSubpackages="true" />
+ <package name="" alias="true" withSubpackages="true" />
</value>
</option>
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b209367..2b48706 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -12,8 +12,6 @@
<entry name="!?*.clj" />
</wildcardResourcePatterns>
<bytecodeTargetLevel>
- <module name="common_jvmMain" target="1.6" />
- <module name="common_jvmTest" target="1.6" />
<module name="taler-kotlin-common_jvmMain" target="1.6" />
<module name="taler-kotlin-common_jvmTest" target="1.6" />
</bytecodeTargetLevel>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 25f810e..b5fb24f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -14,10 +14,10 @@
<option value="$PROJECT_DIR$/cashier" />
<option value="$PROJECT_DIR$/merchant-lib" />
<option value="$PROJECT_DIR$/merchant-terminal" />
+ <option value="$PROJECT_DIR$/multiplatform" />
+ <option value="$PROJECT_DIR$/multiplatform/common" />
<option value="$PROJECT_DIR$/taler-kotlin-android" />
<option value="$PROJECT_DIR$/wallet" />
- <option value="$PROJECT_DIR$/wallet-kotlin" />
- <option value="$PROJECT_DIR$/wallet-kotlin/common" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
diff --git a/wallet-kotlin b/multiplatform
similarity index 100%
rename from wallet-kotlin
rename to multiplatform
diff --git a/settings.gradle b/settings.gradle
index 1e16e26..016a7ea 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':wallet-kotlin:common'
+include ':multiplatform:common'
include ':cashier', ':merchant-terminal', ':wallet'
include ':taler-kotlin-android'
include ':merchant-lib'
diff --git a/taler-kotlin-android/build.gradle
b/taler-kotlin-android/build.gradle
index e6a376c..ca4df8a 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -50,7 +50,7 @@ android {
}
dependencies {
- api project(":wallet-kotlin:common")
+ api project(":multiplatform:common")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.2.0'
@@ -73,5 +73,5 @@ dependencies {
lintPublish 'com.github.thirdegg:lint-rules:0.0.4-alpha'
testImplementation 'junit:junit:4.13'
- testImplementation 'org.json:json:20190722'
+ testImplementation 'org.json:json:20200518'
}
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 495d535..87019f8 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -48,7 +48,7 @@ android {
minSdkVersion 24
targetSdkVersion 29
versionCode 6
- versionName "0.7.1.dev.20"
+ versionName "0.7.1.dev.21"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
buildConfigField "String", "WALLET_CORE_VERSION",
"\"$walletCoreVersion\""
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.