Skip to content
This repository was archived by the owner on Feb 4, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions NeoLang/build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
apply plugin: 'java-library'
apply plugin: 'kotlin'

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
compile rootProject.ext.deps["kotlin-stdlib"]
}

buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath rootProject.ext.deps["kotlin-gradle-plugin"]
}
}
repositories {
mavenCentral()
}

java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
Expand All @@ -27,6 +20,9 @@ compileTestKotlin {
jvmTarget = "1.8"
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.deps["kotlin-stdlib"]
testImplementation rootProject.ext.deps["junit"]
}
7 changes: 3 additions & 4 deletions NeoTermBridge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ def libraryVersionCode = 1
def libraryVersionName = "1.0"

android {
namespace "io.neoterm.bridge"
compileSdkVersion rootProject.ext.android.COMPILE_SDK_VERSION

defaultConfig {
Expand All @@ -23,9 +24,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.2.0'
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'androidx.appcompat:appcompat:1.7.1'
androidTestImplementation('androidx.test.espresso:espresso-core:3.7.0')
testImplementation rootProject.ext.deps["junit"]
}
10 changes: 6 additions & 4 deletions Xorg/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apply plugin: 'com.android.library'

android {
namespace "io.neoterm.xorg"
compileSdkVersion rootProject.ext.android.COMPILE_SDK_VERSION

defaultConfig {
Expand All @@ -22,15 +23,16 @@ android {
jniLibs.srcDirs = ['src/main/jniLibs']
}
}
lintOptions {
disable 'MissingPermission', 'MissingSuperCall', 'UnsafeDynamicallyLoadedCode'
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation rootProject.ext.deps["appcompat-v7"]
implementation 'androidx.appcompat:appcompat:1.7.1'
testImplementation rootProject.ext.deps["junit"]

androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
androidTestImplementation('androidx.test.espresso:espresso-core:3.7.0')
}
14 changes: 5 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
namespace "io.neoterm"
compileSdkVersion rootProject.ext.android.COMPILE_SDK_VERSION

defaultConfig {
Expand Down Expand Up @@ -52,20 +53,15 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
testImplementation rootProject.ext.deps["junit"]
androidTestImplementation project(path: ':NeoLang')

implementation rootProject.ext.deps["kotlin-stdlib"]

implementation 'org.greenrobot:eventbus:3.0.0'
implementation 'com.github.wrdlbrnft:modular-adapter:0.2.0.6'
implementation 'com.github.wrdlbrnft:sorted-list-adapter:0.2.0.19'
implementation 'com.simplecityapps:recyclerview-fastscroll:1.0.16'
implementation 'de.psdev.licensesdialog:licensesdialog:1.8.3'
implementation 'com.github.GrenderG:Color-O-Matic:1.1.5'
implementation 'org.greenrobot:eventbus:3.3.1'
implementation 'com.simplecityapps:recyclerview-fastscroll:2.0.1'
implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0'
implementation 'androidx.annotation:annotation:1.2.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.appcompat:appcompat-resources:1.2.0'
implementation 'androidx.appcompat:appcompat:1.7.1'

implementation project(':chrome-tabs')
implementation project(':NeoLang')
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<activity
android:name=".ui.term.NeoTermActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="true"
android:launchMode="singleTask"
android:theme="@style/AppTheme.NoActionBar.Dark"
android:windowSoftInputMode="adjustResize|stateHidden">
Expand Down Expand Up @@ -137,7 +138,7 @@
<activity
android:name=".ui.other.SetupActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true"
android:exported="false"
android:theme="@style/AppTheme.NoActionBar"/>
<activity
android:name=".ui.other.BonusActivity"
Expand Down Expand Up @@ -174,7 +175,8 @@

<service
android:name=".services.NeoTermService"
android:enabled="true"/>
android:enabled="true"
android:exported="false"/>

<meta-data
android:name="com.sec.android.support.multiwindow"
Expand Down
22 changes: 8 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,49 +1,43 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.4.32'
ext.kotlin_version = '2.3.0'
ext.android = [
KOTLIN_VERSION : '1.4.32',
KOTLIN_VERSION : '2.3.0',
MIN_SDK_VERSION : 26,
COMPILE_SDK_VERSION: 28,
TARGET_SDK_VERSION : 28,
COMPILE_SDK_VERSION: 34,
TARGET_SDK_VERSION : 34,
JUNIT_VERSION : "4.12"
]

ext.deps = [
"annotations" : "androidx.annotation:annotation:1.0.0",
"appcompat-v7" : "androidx.appcompat:appcompat:1.0.0",
"design" : "com.android.support:design:${ext.android.ANDROID_SUPPORT_VERSION}",
"cardview-v7" : "com.android.support:cardview-v7:${ext.android.ANDROID_SUPPORT_VERSION}",
"appcompat-v7" : "androidx.appcompat:appcompat:1.2.0",
"kotlin-stdlib" : "org.jetbrains.kotlin:kotlin-stdlib:${ext.android.KOTLIN_VERSION}",
"kotlin-gradle-plugin": "org.jetbrains.kotlin:kotlin-gradle-plugin:${ext.android.KOTLIN_VERSION}",
"junit" : "junit:junit:${ext.android.JUNIT_VERSION}"
]

repositories {
maven { url 'https://dl.google.com/dl/android/maven2/' }
jcenter()
mavenCentral()
google()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:8.13.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath rootProject.ext.deps["kotlin-gradle-plugin"]

classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

allprojects {
repositories {
jcenter()
maven { url 'https://dl.google.com/dl/android/maven2/' }
mavenCentral()
maven { url 'https://dl.google.com/dl/android/maven2/' }
maven { url "https://jitpack.io" }
google()
}
Expand Down
4 changes: 2 additions & 2 deletions chrome-tabs/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apply plugin: 'com.android.library'

android {
namespace "de.mrapp.android.tabswitcher"
compileSdkVersion rootProject.ext.android.COMPILE_SDK_VERSION

defaultConfig {
Expand All @@ -21,6 +22,5 @@ dependencies {
implementation rootProject.ext.deps["annotations"]
testImplementation rootProject.ext.deps["junit"]

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.appcompat:appcompat-resources:1.2.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
Loading