Update Gradle and Kotlin (#1921)
This commit is contained in:
		
							parent
							
								
									98df581cfd
								
							
						
					
					
						commit
						8201a6cc55
					
				@ -1,11 +1,11 @@
 | 
			
		||||
buildscript {
 | 
			
		||||
    ext.kotlin_version = '1.3.21'
 | 
			
		||||
    ext.kotlin_version = '1.3.60'
 | 
			
		||||
    repositories {
 | 
			
		||||
        jcenter()
 | 
			
		||||
        google()
 | 
			
		||||
    }
 | 
			
		||||
    dependencies {
 | 
			
		||||
        classpath 'com.android.tools.build:gradle:3.3.2'
 | 
			
		||||
        classpath 'com.android.tools.build:gradle:3.5.3'
 | 
			
		||||
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 | 
			
		||||
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							@ -1,6 +1,6 @@
 | 
			
		||||
#Mon Jan 28 18:51:00 EST 2019
 | 
			
		||||
#Thu Dec 26 12:52:51 EST 2019
 | 
			
		||||
distributionBase=GRADLE_USER_HOME
 | 
			
		||||
distributionPath=wrapper/dists
 | 
			
		||||
zipStoreBase=GRADLE_USER_HOME
 | 
			
		||||
zipStorePath=wrapper/dists
 | 
			
		||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
 | 
			
		||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 | 
			
		||||
 | 
			
		||||
@ -11,7 +11,7 @@ ext {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
dependencies {
 | 
			
		||||
    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.13.0'
 | 
			
		||||
    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0'
 | 
			
		||||
    compileOnly 'com.google.code.gson:gson:2.8.2'
 | 
			
		||||
    compileOnly project(':duktape-stub')
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user