Compare commits
	
		
			9 Commits
		
	
	
		
			v1.12-r9b
			...
			v1.12-r9-b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					42c66670b8 | ||
| 
						 | 
					288539b902 | ||
| 
						 | 
					61fd32f121 | ||
| 
						 | 
					43108ec4a6 | ||
| 
						 | 
					51089c6b98 | ||
| 
						 | 
					cf18fcf91c | ||
| 
						 | 
					da0513c768 | ||
| 
						 | 
					37f520cdbe | ||
| 
						 | 
					c98572bee0 | 
							
								
								
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							@@ -361,5 +361,3 @@ jobs:
 | 
			
		||||
        path: |
 | 
			
		||||
          src/keepass2android/bin/*/*-Signed.apk
 | 
			
		||||
 | 
			
		||||
    - name: Perform "make distclean"
 | 
			
		||||
      run: make distclean
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										32
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										32
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							@@ -89,6 +89,10 @@ jobs:
 | 
			
		||||
    - name: Install NuGet dependencies
 | 
			
		||||
      run: make nuget Flavor=${{ matrix.flavor }}
 | 
			
		||||
 | 
			
		||||
    - name: List apks
 | 
			
		||||
      run:  find . -type f -name "*.apk"
 | 
			
		||||
      shell: bash
 | 
			
		||||
 | 
			
		||||
    - name: Build APK (net)
 | 
			
		||||
      env:
 | 
			
		||||
        KeyStore: "${{ github.workspace }}/kp2a.keystore"
 | 
			
		||||
@@ -101,18 +105,26 @@ jobs:
 | 
			
		||||
 | 
			
		||||
      run: |
 | 
			
		||||
        make ${{ matrix.target }} Configuration=Release Flavor=${{ matrix.flavor }}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    
 | 
			
		||||
    - name: List apks
 | 
			
		||||
      run:  find . -type f -name "*.apk"
 | 
			
		||||
      shell: bash
 | 
			
		||||
    
 | 
			
		||||
    - name: Archive production artifacts
 | 
			
		||||
      uses: actions/upload-artifact@v4
 | 
			
		||||
      with:
 | 
			
		||||
        name: signed APK (built on ${{ github.job }})
 | 
			
		||||
        name: keepass2android_${{ matrix.target }}_${{ matrix.flavor }}
 | 
			
		||||
        path: |
 | 
			
		||||
          src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk src/keepass2android-app/bin/Release/**/publish/*.apk
 | 
			
		||||
          src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk
 | 
			
		||||
          src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk
 | 
			
		||||
    
 | 
			
		||||
    - name: Upload APK to GitHub Release
 | 
			
		||||
      uses: softprops/action-gh-release@v2
 | 
			
		||||
      if: github.ref_type == 'tag'
 | 
			
		||||
      with:
 | 
			
		||||
        files: |
 | 
			
		||||
            src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk src/keepass2android-app/bin/Release/**/publish/*.apk
 | 
			
		||||
    - name: List apks
 | 
			
		||||
      run:  find . -type f -name "*.apk"
 | 
			
		||||
      shell: bash
 | 
			
		||||
      
 | 
			
		||||
    #- name: Upload APK to GitHub Release
 | 
			
		||||
    #  uses: softprops/action-gh-release@v2
 | 
			
		||||
    #  if: github.ref_type == 'tag'
 | 
			
		||||
    #  with:
 | 
			
		||||
    #    files: |
 | 
			
		||||
    #        src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							@@ -316,10 +316,10 @@ manifestlink:
 | 
			
		||||
msbuild: manifestlink native java nuget 
 | 
			
		||||
	$(MSBUILD) src/KeePass.sln -target:keepass2android-app -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -p:BuildProjectReferences=true $(MSBUILD_PARAM) -p:Platform="Any CPU" -m
 | 
			
		||||
 | 
			
		||||
apk: msbuild 
 | 
			
		||||
apk: manifestlink native java nuget  
 | 
			
		||||
	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m 
 | 
			
		||||
 | 
			
		||||
apk_split: msbuild
 | 
			
		||||
apk_split: manifestlink native java nuget 
 | 
			
		||||
	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-arm
 | 
			
		||||
	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-arm64
 | 
			
		||||
	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-x86
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
<?xml version="1.0" encoding="utf-8"?>
 | 
			
		||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 | 
			
		||||
      android:versionCode="216"
 | 
			
		||||
      android:versionName="1.12-r9b"
 | 
			
		||||
      android:versionCode="217"
 | 
			
		||||
      android:versionName="1.12-r9c"
 | 
			
		||||
      package="keepass2android.keepass2android"
 | 
			
		||||
      xmlns:tools="http://schemas.android.com/tools"
 | 
			
		||||
      android:installLocation="auto">
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
<?xml version="1.0" encoding="utf-8"?>
 | 
			
		||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 | 
			
		||||
      android:versionCode="216"
 | 
			
		||||
      android:versionName="1.12-r9b"
 | 
			
		||||
      android:versionCode="217"
 | 
			
		||||
      android:versionName="1.12-r9c"
 | 
			
		||||
      package="keepass2android.keepass2android_nonet"
 | 
			
		||||
      xmlns:tools="http://schemas.android.com/tools"
 | 
			
		||||
      android:installLocation="auto">
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user