mirror of
				https://github.com/yggdrasil-network/yggdrasil-android.git
				synced 2025-11-04 11:15:08 +03:00 
			
		
		
		
	Merge branch 'main' into main
This commit is contained in:
		
						commit
						978c446016
					
				
					 7 changed files with 151 additions and 20 deletions
				
			
		| 
						 | 
				
			
			@ -17,11 +17,27 @@ android {
 | 
			
		|||
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    signingConfigs {
 | 
			
		||||
        create("yggdrasil") {
 | 
			
		||||
            // You need to specify either an absolute path or include the
 | 
			
		||||
            // keystore file in the same directory as the build.gradle file.
 | 
			
		||||
            storeFile = file("gha.jks")
 | 
			
		||||
            storePassword = "g1thub4ct10n34yggdr4s1l4ndr01d"
 | 
			
		||||
            keyAlias = "yggdrasil-android"
 | 
			
		||||
            keyPassword = "g1thub4ct10n34yggdr4s1l4ndr01d"
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    buildTypes {
 | 
			
		||||
        release {
 | 
			
		||||
            minifyEnabled false
 | 
			
		||||
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 | 
			
		||||
        }
 | 
			
		||||
        yggdrasil {
 | 
			
		||||
            minifyEnabled false
 | 
			
		||||
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 | 
			
		||||
            signingConfig = signingConfigs.getByName("yggdrasil")
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    compileOptions {
 | 
			
		||||
        sourceCompatibility JavaVersion.VERSION_1_8
 | 
			
		||||
| 
						 | 
				
			
			@ -43,4 +59,4 @@ dependencies {
 | 
			
		|||
    testImplementation 'junit:junit:4.+'
 | 
			
		||||
    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 | 
			
		||||
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 | 
			
		||||
}
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							| 
						 | 
				
			
			@ -1,18 +0,0 @@
 | 
			
		|||
{
 | 
			
		||||
  "version": 2,
 | 
			
		||||
  "artifactType": {
 | 
			
		||||
    "type": "APK",
 | 
			
		||||
    "kind": "Directory"
 | 
			
		||||
  },
 | 
			
		||||
  "applicationId": "eu.neilalexander.yggdrasil",
 | 
			
		||||
  "variantName": "release",
 | 
			
		||||
  "elements": [
 | 
			
		||||
    {
 | 
			
		||||
      "type": "SINGLE",
 | 
			
		||||
      "filters": [],
 | 
			
		||||
      "versionCode": 1,
 | 
			
		||||
      "versionName": "1.0",
 | 
			
		||||
      "outputFile": "app-release.apk"
 | 
			
		||||
    }
 | 
			
		||||
  ]
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue