qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fixes

Browse Source
This commit is contained in:
Chih-Hsuan Yen
2019-07-16 20:32:03 +08:00
parent 87cfa4c4d4
commit e081a6aa2c
13 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -1,6 +1,6 @@
[submodule "src/SamsungPass"]
path = src/SamsungPass
url = https://github.com/PhilippC/Xamarin-Samsung-Pass.git
url = https://github.com/gilbsgilbs/Xamarin-Samsung-Pass.git
[submodule "src/netftpandroid"]
path = src/netftpandroid
url = https://github.com/PhilippC/netftpandroid.git

2
src/SamsungPass

Submodule src/SamsungPass updated: f3c6bbe224...dbfbf6d488

2
src/build-scripts/build-java.sh
View File

@@ -1,6 +1,8 @@
#!/bin/bash
set -e
unset ANDROID_NDK_HOME ANDROID_NDK
pushd ../java/
pushd JavaFileStorageTest-AS

2
src/java/JavaFileStorage/app/build.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 15
targetSdkVersion 23

2
src/java/JavaFileStorageTest-AS/app/build.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "com.crocoapps.javafilestoragetest"

2
src/java/KP2ASoftkeyboard_AS/app/build.gradle
View File

@@ -1,7 +1,7 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 23
buildToolsVersion '26.0.2'
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 18

6
src/java/Keepass2AndroidPluginSDK2/app/build.gradle
View File

@@ -1,7 +1,7 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 'Google Inc.:Google APIs:23'
buildToolsVersion '26.0.2'
compileSdkVersion 23
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 8
@@ -17,4 +17,4 @@ android {
}
dependencies {
}
}

2
src/java/PluginQR/app/build.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "keepass2android.plugin.qr"

2
src/java/android-filechooser-AS/app/build.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 15

4
src/keepass2android/Properties/AndroidManifest_debug.xml
View File

@@ -108,7 +108,7 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<uses-library required="false" name="com.sec.android.app.multiwindow" />
<uses-library android:required="false" android:name="com.sec.android.app.multiwindow" />
<meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" />
@@ -127,4 +127,4 @@
<!-- Samsung Pass permission -->
<uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />
</manifest>
</manifest>

4
src/keepass2android/Properties/AndroidManifest_net.xml
View File

@@ -132,7 +132,7 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<uses-library required="false" name="com.sec.android.app.multiwindow" />
<uses-library android:required="false" android:name="com.sec.android.app.multiwindow" />
<meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" />
@@ -153,4 +153,4 @@
<!-- Samsung Pass permission -->
<uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />
</manifest>
</manifest>

4
src/keepass2android/Properties/AndroidManifest_nonet.xml
View File

@@ -123,7 +123,7 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<uses-library required="false" name="com.sec.android.app.multiwindow" />
<uses-library android:required="false" android:name="com.sec.android.app.multiwindow" />
<meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" />
@@ -138,4 +138,4 @@
<uses-permission android:name="keepass2android.keepass2android.permission.KP2aInternalSearch" />
<!-- Samsung Pass permission -->
<uses-permission android:name="com.samsung.android.providers.context.permission.WRITE_USE_APP_FEATURE_SURVEY" />
</manifest>
</manifest>

8
src/keepass2android/keepass2android.csproj
View File

@@ -40,7 +40,7 @@
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<Debugger>Xamarin</Debugger>
<DevInstrumentationEnabled>True</DevInstrumentationEnabled>
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
<AndroidSupportedAbis>armeabi-v7a,x86</AndroidSupportedAbis>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<BundleAssemblies>false</BundleAssemblies>
@@ -58,7 +58,7 @@
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
<ConsolePause>False</ConsolePause>
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86,x86_64</AndroidSupportedAbis>
<AndroidSupportedAbis>armeabi-v7a,x86,x86_64</AndroidSupportedAbis>
<CustomCommands>
<CustomCommands>
<Command type="BeforeBuild" command="UseManifestNet.bat" />
@@ -93,7 +93,7 @@
<Command type="BeforeBuild" command="UseManifestNoNet.bat" workingdir="" />
</CustomCommands>
</CustomCommands>
<AndroidSupportedAbis>armeabi,armeabi-v7a</AndroidSupportedAbis>
<AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>
<DeployExternal>True</DeployExternal>
<JavaOptions>
</JavaOptions>
@@ -1968,4 +1968,4 @@
<Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.v7.AppCompat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.AppCompat.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.v7.AppCompat.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.Design.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.26.1.0.1\build\MonoAndroid80\Xamarin.Android.Support.Design.targets')" />
</Project>
</Project>