Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Duy Tran committed Nov 10, 2023
2 parents f8f1450 + 281ca62 commit 0f6bef8
Show file tree
Hide file tree
Showing 186 changed files with 1,095 additions and 2,172 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Android CI

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew :app:assembleDebug
3 changes: 2 additions & 1 deletion .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<p align="left">
<a href="https://discord.gg/tYknzr2qam" target="blank"><img src="https://img.shields.io/discord/869895703718166529.svg?color=7289da&label=Join Symja @ Discord&logo=discord&style=for-the-badge" alt="Join Symja @ Discord" />
</p>

# Overview

This is an Android application for [Symja computer algebra language](https://github.com/axkr/symja_android_library)
Expand Down
24 changes: 13 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {

defaultConfig {
applicationId "com.symja.app"
minSdk 28
minSdk 31
versionCode 1
versionName "1.0"

Expand All @@ -23,19 +23,17 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
// https://developer.android.com/studio/write/java8-support
// For AGP 4.1+
coreLibraryDesugaringEnabled = true

sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "11"
jvmTarget = "1.8"
}
// sourceSets {
// androidTest {
// java {
// srcDir '../symja_android_library/symja_android_library/matheclipse-core/src/test/java'
// }
// }
// }

packagingOptions {
resources {
Expand Down Expand Up @@ -64,17 +62,21 @@ dependencies {
}
}

coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")

testImplementation 'junit:junit:4.13.2'

androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test:rules:1.5.0'

implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.browser:browser:1.6.0"

// implementation 'com.google.guava:guava:32.1.2-android'
// implementation('org.matheclipse:matheclipse-gpl:3.0.0-SNAPSHOT') {
Expand Down
34 changes: 0 additions & 34 deletions app/sampledata/mathematica/language-configuration.json

This file was deleted.

Loading

0 comments on commit 0f6bef8

Please sign in to comment.