diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index cb80f57..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1 +0,0 @@ -# SOON TO COME \ No newline at end of file diff --git a/README.md b/README.md index 09c543a..041e232 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,28 @@ -# NPS Browser -NPS Client app for android written in kotlin. - -## Building -The application targets android 10 (API 29) with a minimum version of android 6 (API 23). - -1. Create a `keystore` using android studio: `Build > Generate Signed Bundle / APK > Next > Create new` -2. Create a `keystore.properties` file in the root directory of the repo. -3. Specify the keystore location, alias and keys in `keystore.properties`\ -For example: -``` -storePassword=password -keyPassword=password2 -keyAlias=alias1 -storeFile=keyStore.jks -``` -4. Move your newly generated `keyStore.jks` file to `app/` - -Note: keyStore is relative to the `app` directory. So it's very **recommended** to save it as `app/keyStore.jks` - -## Contributing -See [CONTRIBUTING.md](CONTRIBUTING.md) - -## License -This repository is licensed under the GPLv2 license. - -## Disclaimer -No mentions of any links or piracy related content will be tolerated on this repository, and any persons asking for help with such things will be ignored, not recieve any sort of help or potentially get banned. \ No newline at end of file +# NPS Browser +NPS Client app for android written in kotlin. + +## Building +The application targets android 10 (API 29) with a minimum version of android 6 (API 23). + +1. Create a `keystore` using android studio: `Build > Generate Signed Bundle / APK > Next > Create new` +2. Create a `keystore.properties` file in the root directory of the repo. +3. Specify the keystore location, alias and keys in `keystore.properties`\ +For example: +``` +storePassword=password +keyPassword=password2 +keyAlias=alias1 +storeFile=keyStore.jks +``` +4. Move your newly generated `keyStore.jks` file to `app/` + +Note: keyStore is relative to the `app` directory. So it's very **recommended** to save it as `app/keyStore.jks` + +## Contributing +Contributions are very welcome, just open a PR if you have a piece of code to contribute and we'll iron out the details when it's time. + +## License +This repository is licensed under the GPLv2 license. + +## Disclaimer +No mentions of any links or piracy related content will be tolerated on this repository, and any persons asking for help with such things will be ignored, not receive any sort of help or potentially get banned. diff --git a/app/build.gradle b/app/build.gradle index 91a2cd4..ab2f937 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,66 +1,75 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - -def keystorePropertiesFile = rootProject.file("keystore.properties") -def keystoreProperties = new Properties() - -keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) - -android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" - - defaultConfig { - applicationId "com.illusionware.npsbrowser" - minSdkVersion 23 - targetSdkVersion 29 - versionCode 1 - versionName "0.0.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - dataBinding { - enabled = true - } - - viewBinding { - enabled = true - } - - signingConfigs { - release { - storeFile file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] - keyAlias = keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - } - } - - buildTypes { - release { - signingConfig signingConfigs.release - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.core:core-ktx:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'com.github.doyaaaaaken:kotlin-csv-jvm:0.7.3' - implementation "androidx.cardview:cardview:1.0.0" - implementation 'androidx.navigation:navigation-fragment-ktx:2.0.0' - implementation 'androidx.navigation:navigation-ui-ktx:2.0.0' - implementation 'androidx.preference:preference:1.1.0-rc01' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - implementation 'com.google.android.material:material:1.1.0' -} +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' + +def keystorePropertiesFile = rootProject.file("keystore.properties") +def keystoreProperties = new Properties() + +keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + +android { + compileSdkVersion 30 + buildToolsVersion "29.0.3" + + defaultConfig { + applicationId "com.illusionware.npsbrowser" + minSdkVersion 23 + targetSdkVersion 30 + versionCode 1 + versionName "0.1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + dataBinding { + enabled = true + } + + viewBinding { + enabled = true + } + + signingConfigs { + release { + storeFile file(keystoreProperties['storeFile']) + storePassword keystoreProperties['storePassword'] + keyAlias = keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + } + } + + buildTypes { + release { + signingConfig signingConfigs.release + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.constraintlayout:constraintlayout:2.0.2' + implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0" + implementation 'com.github.doyaaaaaken:kotlin-csv-jvm:0.11.1' + implementation "androidx.cardview:cardview:1.0.0" + implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' + implementation 'androidx.navigation:navigation-ui-ktx:2.3.0' + implementation 'androidx.preference:preference-ktx:1.1.1' + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + implementation 'com.google.android.material:material:1.2.1' +} diff --git a/build.gradle b/build.gradle index 84b783e..d49c709 100644 --- a/build.gradle +++ b/build.gradle @@ -1,29 +1,29 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = '1.3.72' - repositories { - google() - jcenter() - - } - dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' - 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 - } -} - -allprojects { - repositories { - google() - jcenter() - - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext.kotlin_version = '1.3.72' + repositories { + google() + jcenter() + + } + dependencies { + classpath 'com.android.tools.build:gradle:4.1.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 + } +} + +allprojects { + repositories { + google() + jcenter() + + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9e3cbcb..85f67b9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 29 00:35:10 EEST 2020 +#Tue Oct 20 12:27:05 GMT+03:00 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip