diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 179c3b07a..668557c7f 100755
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -71,5 +71,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/data/common/tooling-api-all.jar b/app/src/main/assets/data/common/tooling-api-all.jar
index 1d5e92132..63489d037 100644
Binary files a/app/src/main/assets/data/common/tooling-api-all.jar and b/app/src/main/assets/data/common/tooling-api-all.jar differ
diff --git a/build.gradle b/build.gradle
index 2db0c8d27..ced890bbb 100755
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ import java.nio.file.Paths
import java.util.stream.Collectors
buildscript {
- apply from: "gradle/dependencies.gradle"
+ apply from: "dependencies.gradle"
project.ext {
compileSdk = 31
@@ -24,21 +24,31 @@ buildscript {
}
repositories {
- google ()
- mavenLocal ()
- mavenCentral ()
+ mavenLocal()
+
+ // Do not use mavenCentral()
+ maven {
+ url 'https://repo1.maven.org/maven2'
+ }
+
+ // Do not use google()
+ maven {
+ url 'https://maven.google.com'
+ }
+
maven {
url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
}
+
maven {
url 'https://jitpack.io'
}
}
dependencies {
- classpath "com.android.tools.build:gradle:$agp_version"
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath "com.google.googlejavaformat:google-java-format:$google_java_format_version"
+ classpath classpaths.agp
+ classpath classpaths.kotlin_gradle_plugin
+ classpath classpaths.google_java_format
}
}
@@ -54,6 +64,37 @@ subprojects {
}
}
+allprojects {
+
+ tasks.withType (org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+ kotlinOptions {
+ freeCompilerArgs += '-Xjvm-default=all'
+ }
+ }
+
+ repositories {
+ mavenLocal()
+
+ // Do not use mavenCentral()
+ maven {
+ url 'https://repo1.maven.org/maven2'
+ }
+
+ // Do not use google()
+ maven {
+ url 'https://maven.google.com'
+ }
+
+ maven {
+ url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
+ }
+
+ maven {
+ url 'https://jitpack.io'
+ }
+ }
+}
+
private void checkTranslations (Project project) {
def php = new File ("/usr/bin/php")
if (!php.exists ()) {
@@ -110,27 +151,6 @@ private void checkTranslations (Project project) {
}
}
-allprojects {
-
- tasks.withType (org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
- kotlinOptions {
- freeCompilerArgs += '-Xjvm-default=all'
- }
- }
-
- repositories {
- google ()
- mavenLocal ()
- mavenCentral ()
- maven {
- url 'https://jitpack.io'
- }
- maven {
- url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
- }
- }
-}
-
task clean (type: Delete) {
delete rootProject.buildDir
}
diff --git a/gradle/dependencies.gradle b/dependencies.gradle
similarity index 89%
rename from gradle/dependencies.gradle
rename to dependencies.gradle
index 16fde5e27..b0e5ab282 100755
--- a/gradle/dependencies.gradle
+++ b/dependencies.gradle
@@ -3,7 +3,11 @@ ext {
kotlin_version = '1.7.0'
google_java_format_version = '1.15.0'
- appcompat = '1.4.1'
+ classpaths = [
+ agp: "com.android.tools.build:gradle:$agp_version",
+ kotlin_gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version",
+ google_java_format: "com.google.googlejavaformat:google-java-format:$google_java_format_version"
+ ]
androidide = [
javac: 'io.github.itsaky:nb-javac-android:17.0.0.3-SNAPSHOT'
@@ -31,7 +35,7 @@ ext {
androidx = [
annotation : 'androidx.annotation:annotation:1.3.0',
- appcompat : "androidx.appcompat:appcompat:$appcompat",
+ appcompat : 'androidx.appcompat:appcompat:1.4.1',
cardview : 'androidx.cardview:cardview:1.0.0',
constraintlayout : 'androidx.constraintlayout:constraintlayout:2.1.3',
coordinatorlayout: 'androidx.coordinatorlayout:coordinatorlayout:1.1.0',
diff --git a/tests/test-home/.androidide/init/model.jar b/tests/test-home/.androidide/init/model.jar
index c43ff76be..0ad12a062 100644
Binary files a/tests/test-home/.androidide/init/model.jar and b/tests/test-home/.androidide/init/model.jar differ