From ac1abdb70e915117b74a10e2722a29bfb8e04214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A6=8A=E5=8E=9F=E6=98=8C=E5=BD=A6?=
 <sakakibara@rdlabo.jp>
Date: Thu, 5 Dec 2024 14:12:14 +0900
Subject: [PATCH] feat(terminal): remove kotlin settings from demo

---
 demo/angular/android/app/build.gradle  | 13 -------------
 demo/angular/android/build.gradle      |  3 ---
 demo/angular/android/variables.gradle  |  1 -
 packages/terminal/android/build.gradle |  2 +-
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/demo/angular/android/app/build.gradle b/demo/angular/android/app/build.gradle
index 158afc43f..9b9521627 100644
--- a/demo/angular/android/app/build.gradle
+++ b/demo/angular/android/app/build.gradle
@@ -1,6 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
 
 android {
     namespace "io.ionic.starter"
@@ -34,7 +32,6 @@ repositories {
     flatDir{
         dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
     }
-    maven { url 'https://jitpack.io' }
 }
 
 dependencies {
@@ -47,16 +44,6 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation project(':capacitor-cordova-android-plugins')
-    constraints {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
-            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
-        }
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
-            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-        }
-    }
-    implementation "androidx.core:core-ktx:1.6.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 apply from: 'capacitor.build.gradle'
diff --git a/demo/angular/android/build.gradle b/demo/angular/android/build.gradle
index 1dedfcbf5..2387c0605 100644
--- a/demo/angular/android/build.gradle
+++ b/demo/angular/android/build.gradle
@@ -1,8 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '2.0.+'
-
     repositories {
         google()
         mavenCentral()
@@ -10,7 +8,6 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:8.2.1'
         classpath 'com.google.gms:google-services:4.4.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/demo/angular/android/variables.gradle b/demo/angular/android/variables.gradle
index 75d97a49b..9c1bbf52e 100644
--- a/demo/angular/android/variables.gradle
+++ b/demo/angular/android/variables.gradle
@@ -13,7 +13,6 @@ ext {
     androidxJunitVersion = '1.1.5'
     androidxEspressoCoreVersion = '3.5.1'
     cordovaAndroidVersion = '10.1.1'
-    kotlin_version= '1.8.10'
 
     // If you use @capacitor-community/stripe:
     // stripeAndroidVersion = '20.39.+'
diff --git a/packages/terminal/android/build.gradle b/packages/terminal/android/build.gradle
index c753b9375..daf427c16 100644
--- a/packages/terminal/android/build.gradle
+++ b/packages/terminal/android/build.gradle
@@ -11,7 +11,7 @@ ext {
 }
 
 buildscript {
-    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '20.0.+'
+    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '2.0.+'
     repositories {
         google()
         mavenCentral()