mirror of
				https://github.com/yggdrasil-network/yggdrasil-android.git
				synced 2025-11-03 18:55:08 +03:00 
			
		
		
		
	Updated graddle and some deps.
This commit is contained in:
		
							parent
							
								
									8dfa2f638a
								
							
						
					
					
						commit
						c867647af8
					
				
					 5 changed files with 12 additions and 8 deletions
				
			
		| 
						 | 
					@ -4,7 +4,7 @@ plugins {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
android {
 | 
					android {
 | 
				
			||||||
    compileSdkVersion 33
 | 
					    compileSdkVersion 34
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    defaultConfig {
 | 
					    defaultConfig {
 | 
				
			||||||
        applicationId "eu.neilalexander.yggdrasil"
 | 
					        applicationId "eu.neilalexander.yggdrasil"
 | 
				
			||||||
| 
						 | 
					@ -45,12 +45,13 @@ android {
 | 
				
			||||||
    kotlinOptions {
 | 
					    kotlinOptions {
 | 
				
			||||||
        jvmTarget = '1.8'
 | 
					        jvmTarget = '1.8'
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    namespace 'eu.neilalexander.yggdrasil'
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dependencies {
 | 
					dependencies {
 | 
				
			||||||
    implementation fileTree(include: ['*.aar'], dir: 'libs')
 | 
					    implementation fileTree(include: ['*.aar'], dir: 'libs')
 | 
				
			||||||
    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 | 
					    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 | 
				
			||||||
    implementation 'androidx.core:core-ktx:1.6.0'
 | 
					    implementation 'androidx.core:core-ktx:1.12.0'
 | 
				
			||||||
    implementation 'androidx.appcompat:appcompat:1.6.1'
 | 
					    implementation 'androidx.appcompat:appcompat:1.6.1'
 | 
				
			||||||
    implementation 'com.google.android.material:material:1.5.0'
 | 
					    implementation 'com.google.android.material:material:1.5.0'
 | 
				
			||||||
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 | 
					    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,5 @@
 | 
				
			||||||
<?xml version="1.0" encoding="utf-8"?>
 | 
					<?xml version="1.0" encoding="utf-8"?>
 | 
				
			||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 | 
					<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 | 
				
			||||||
    package="eu.neilalexander.yggdrasil">
 | 
					 | 
				
			||||||
    <uses-permission android:name="android.permission.INTERNET" />
 | 
					    <uses-permission android:name="android.permission.INTERNET" />
 | 
				
			||||||
    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
 | 
					    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
 | 
				
			||||||
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 | 
					    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,7 @@ buildscript {
 | 
				
			||||||
        mavenCentral()
 | 
					        mavenCentral()
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    dependencies {
 | 
					    dependencies {
 | 
				
			||||||
        classpath 'com.android.tools.build:gradle:7.4.2'
 | 
					        classpath 'com.android.tools.build:gradle:8.1.4'
 | 
				
			||||||
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 | 
					        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // NOTE: Do not place your application dependencies here; they belong
 | 
					        // NOTE: Do not place your application dependencies here; they belong
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,3 +17,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 | 
				
			||||||
android.useAndroidX=true
 | 
					android.useAndroidX=true
 | 
				
			||||||
# Kotlin code style for this project: "official" or "obsolete":
 | 
					# Kotlin code style for this project: "official" or "obsolete":
 | 
				
			||||||
kotlin.code.style=official
 | 
					kotlin.code.style=official
 | 
				
			||||||
 | 
					#android.enableR8.fullMode=false
 | 
				
			||||||
 | 
					android.defaults.buildfeatures.buildconfig=true
 | 
				
			||||||
 | 
					android.nonTransitiveRClass=false
 | 
				
			||||||
 | 
					android.nonFinalResIds=false
 | 
				
			||||||
							
								
								
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
#Sat Aug 26 21:38:34 CEST 2023
 | 
					#Mon Nov 27 01:27:23 CET 2023
 | 
				
			||||||
distributionBase=GRADLE_USER_HOME
 | 
					distributionBase=GRADLE_USER_HOME
 | 
				
			||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 | 
					distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 | 
				
			||||||
distributionPath=wrapper/dists
 | 
					distributionPath=wrapper/dists
 | 
				
			||||||
zipStorePath=wrapper/dists
 | 
					zipStorePath=wrapper/dists
 | 
				
			||||||
zipStoreBase=GRADLE_USER_HOME
 | 
					zipStoreBase=GRADLE_USER_HOME
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue