diff --git a/Android-Sample/app/build.gradle b/Android-Sample/app/build.gradle index 9192c11..777c5c1 100644 --- a/Android-Sample/app/build.gradle +++ b/Android-Sample/app/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 33 defaultConfig { applicationId "artts.android.karrar.arabictts" minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 33 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -17,14 +16,15 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + namespace 'artts.android.karrar.arabictts' } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - testCompile 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' } diff --git a/Android-Sample/app/src/main/AndroidManifest.xml b/Android-Sample/app/src/main/AndroidManifest.xml index 39de685..bdb1e58 100644 --- a/Android-Sample/app/src/main/AndroidManifest.xml +++ b/Android-Sample/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + diff --git a/Android-Sample/app/src/main/java/artts/android/karrar/arabictts/MainActivity.java b/Android-Sample/app/src/main/java/artts/android/karrar/arabictts/MainActivity.java index d8bc53d..1224890 100644 --- a/Android-Sample/app/src/main/java/artts/android/karrar/arabictts/MainActivity.java +++ b/Android-Sample/app/src/main/java/artts/android/karrar/arabictts/MainActivity.java @@ -1,12 +1,13 @@ package artts.android.karrar.arabictts; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; +import androidx.appcompat.app.AppCompatActivity; + import artts.android.karrar.arabictts.utls.ArabicTTS; public class MainActivity extends AppCompatActivity { diff --git a/Android-Sample/app/src/main/java/artts/android/karrar/arabictts/utls/ArabicTTS.java b/Android-Sample/app/src/main/java/artts/android/karrar/arabictts/utls/ArabicTTS.java index d2bf01b..75f6670 100644 --- a/Android-Sample/app/src/main/java/artts/android/karrar/arabictts/utls/ArabicTTS.java +++ b/Android-Sample/app/src/main/java/artts/android/karrar/arabictts/utls/ArabicTTS.java @@ -117,8 +117,8 @@ private String convert(String text,int type){ } } if(type == 1) - text = text.replace("a "," "); - return text; + text = text.replace("a "," "); + return text; } diff --git a/Android-Sample/build.gradle b/Android-Sample/build.gradle index d0aa704..01b008f 100644 --- a/Android-Sample/build.gradle +++ b/Android-Sample/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' + classpath 'com.android.tools.build:gradle:7.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/Android-Sample/gradle.properties b/Android-Sample/gradle.properties index aac7c9b..9e6fce1 100644 --- a/Android-Sample/gradle.properties +++ b/Android-Sample/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/Android-Sample/gradle/wrapper/gradle-wrapper.properties b/Android-Sample/gradle/wrapper/gradle-wrapper.properties index ac949c3..08fa954 100644 --- a/Android-Sample/gradle/wrapper/gradle-wrapper.properties +++ b/Android-Sample/gradle/wrapper/gradle-wrapper.properties @@ -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-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip diff --git a/Android-Sample/local.properties b/Android-Sample/local.properties index 7ce06ff..177eebd 100644 --- a/Android-Sample/local.properties +++ b/Android-Sample/local.properties @@ -1,12 +1,9 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, +## This file must *NOT* be checked into Version Control Systems, # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Fri Jul 21 22:49:48 AST 2017 +#Sat Feb 25 10:27:17 AST 2023 +sdk.dir=/Users/areebmohamed/Library/Android/sdk ndk.dir=/home/karrar/Android/Sdk/ndk-bundle -sdk.dir=/home/karrar/Android/Sdk