Merge pull request #19 from baolanlequang/development

baolanlequang · web-flow · commit dd219ace1cb0 · 2023-06-15T21:20:07.000+02:00
update java version
diff --git a/JcampConverter/JcampConverter/build.gradle b/JcampConverter/JcampConverter/build.gradle
@@ -23,17 +23,17 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_9
-        targetCompatibility JavaVersion.VERSION_1_9
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
     testImplementation 'junit:junit:4.13.2'
diff --git a/JcampConverter/app/build.gradle b/JcampConverter/app/build.gradle
@@ -24,11 +24,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_9
-        targetCompatibility JavaVersion.VERSION_1_9
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,17 @@ android {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`compileOptions {`
`26`		`- sourceCompatibility JavaVersion.VERSION_1_9`
`27`		`- targetCompatibility JavaVersion.VERSION_1_9`
	`26`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`27`	`+ targetCompatibility JavaVersion.VERSION_17`
`28`	`28`	`}`
`29`	`29`	`kotlinOptions {`
`30`		`- jvmTarget = '1.8'`
	`30`	`+ jvmTarget = '17'`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`dependencies {`
`35`	`35`
`36`		`- implementation 'androidx.core:core-ktx:1.8.0'`
	`36`	`+ implementation 'androidx.core:core-ktx:1.10.1'`
`37`	`37`	`implementation 'androidx.appcompat:appcompat:1.6.1'`
`38`	`38`	`implementation 'com.google.android.material:material:1.9.0'`
`39`	`39`	`testImplementation 'junit:junit:4.13.2'`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ android {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`compileOptions {`
`27`		`- sourceCompatibility JavaVersion.VERSION_1_9`
`28`		`- targetCompatibility JavaVersion.VERSION_1_9`
	`27`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`28`	`+ targetCompatibility JavaVersion.VERSION_17`
`29`	`29`	`}`
`30`	`30`	`kotlinOptions {`
`31`		`- jvmTarget = '1.8'`
	`31`	`+ jvmTarget = '17'`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`